diff --git a/app/assets/css/bootstrap-override.css b/app/assets/css/bootstrap-override.css index 15254bf98..09c546a0c 100644 --- a/app/assets/css/bootstrap-override.css +++ b/app/assets/css/bootstrap-override.css @@ -345,6 +345,8 @@ input:checked + .slider:before { /* Status Indicator Inside Table Section Label Style */ .table .label { border-radius: 8px !important; + display: inline-flex; + align-items: center; } .table .label .label-danger { @@ -387,3 +389,23 @@ input:checked + .slider:before { font-size: 85%; margin-left: 10px; } + +/* Pagination */ +.datatable .footer .paginationControls .pagination { + border: 1px solid var(--border-pagination-color); +} + +.pagination li button { + color: var(--ui-gray-9) !important; +} + +.pagination li:active button, +.pagination li:focus button { + border: 1px solid var(--ui-gray-5) !important; +} + +.pagination li a { + text-decoration: none !important; + cursor: pointer; + color: var(--ui-gray-9) !important; +} diff --git a/app/assets/css/button.css b/app/assets/css/button.css index eb7126e30..91269e994 100644 --- a/app/assets/css/button.css +++ b/app/assets/css/button.css @@ -45,20 +45,19 @@ } .btn-dangerlight { - background-color: var(--ui-error-2) !important; - border: 1px solid var(--border-button-group); - color: var(--ui-error-8); + border: 1px solid var(--text-button-dangerlight-color); + color: var(--ui-error-9); } .btn-dangerlight:hover { color: var(--ui-error-9) !important; - background-color: var(--ui-error-3) !important; + background-color: var(--ui-error-2) !important; } .btn-light { - background-color: var(--bg-button-group); + background-color: var(--bg-button-group-color); border: 1px solid var(--border-button-group); - color: var(--text-button-group); + color: var(--text-button-group-color); } .btn-light:hover { @@ -73,9 +72,9 @@ /* Button Secondary */ .btn-secondary { - background-color: var(--ui-blue-2); - border: 1px solid var(--ui-blue-8); - color: var(--ui-blue-9); + background-color: var(--ui-blue-2) !important; + border: 1px solid var(--ui-blue-8) !important; + color: var(--ui-blue-9) !important; } .btn-secondary:hover, @@ -90,3 +89,21 @@ border: 1px solid var(--ui-blue-1); color: var(--ui-blue-5); } + +form a, +.form-group a, +.hyperlink { + color: var(--ui-blue-8); +} + +form a:hover, +.form-group a:hover, +.hyperlink:hover { + text-decoration: underline; + color: var(--ui-blue-9); +} + +.btn-group > .btn:first-child:not(:last-child):not(.dropdown-toggle) { + background: var(--bg-button-group-color) !important; + color: var(--text-button-group-color); +} diff --git a/app/assets/css/icon.css b/app/assets/css/icon.css index aafe80cc1..cfad287c4 100644 --- a/app/assets/css/icon.css +++ b/app/assets/css/icon.css @@ -45,7 +45,8 @@ pr-icon { stroke: var(--white-color); } -.icon-primary { +.icon-primary, +.icon-blue { color: var(--ui-blue-8); } @@ -63,7 +64,8 @@ pr-icon { stroke: var(--black-color); } -.icon-warning { +.icon-warning, +.icon-orange { color: var(--ui-warning-8); } @@ -73,11 +75,11 @@ pr-icon { } .icon-danger { - color: var(--ui-error-8); + color: var(--ui-error-9); } .icon.icon-danger-alt { - fill: var(--ui-error-8); + fill: var(--ui-error-9); stroke: var(--white-color); } diff --git a/app/assets/css/theme.css b/app/assets/css/theme.css index 54ddd2086..e069aeaa0 100644 --- a/app/assets/css/theme.css +++ b/app/assets/css/theme.css @@ -119,9 +119,10 @@ --bg-pre-color: var(--grey-14); --bg-blocklist-item-selected-color: var(--grey-12); --bg-progress-color: var(--grey-14); - --bg-pagination-color: var(--white-color); + --bg-pagination-color: var(--ui-blue-3); + --border-pagination-color: var(--ui-white); --bg-pagination-span-color: var(--white-color); - --bg-pagination-hover-color: var(--grey-11); + --bg-pagination-hover-color: var(--ui-blue-3); --bg-ui-select-hover-color: var(--grey-14); --bg-motd-body-color: var(--grey-20); --bg-item-highlighted-color: var(--grey-21); @@ -162,6 +163,8 @@ --bg-inputbox: var(--ui-gray-2); --bg-dropdown-hover: var(--ui-gray-3); --bg-webeditor-color: var(--ui-gray-3); + --bg-button-group-color: var(--ui-white); + --bg-pagination-disabled-color: var(--ui-white); --text-main-color: var(--grey-7); --text-body-color: var(--grey-6); @@ -192,8 +195,8 @@ --text-blocklist-item-selected-color: var(--grey-37); --text-progress-bar-color: var(--grey-27); --text-pagination-color: var(--grey-26); - --text-pagination-span-color: var(--ui-gray-3); - --text-pagination-span-hover-color: var(--blue-4); + --text-pagination-span-color: var(--grey-3); + --text-pagination-span-hover-color: var(--grey-3); --text-ui-select-color: var(--grey-6); --text-ui-select-hover-color: var(--grey-28); --text-summary-color: var(--black-color); @@ -207,6 +210,8 @@ --text-button-hover-color: var(--grey-6); --text-small-select-color: var(--grey-25); --text-bootbox: var(--ui-gray-7); + --text-button-group-color: var(--ui-gray-9); + --text-button-dangerlight-color: var(--ui-error-5); --border-color: var(--grey-42); --border-widget-color: var(--grey-43); @@ -227,9 +232,9 @@ --border-codemirror-gutters-color: var(--grey-19); --border-pre-color: var(--grey-43); --border-blocklist-item-selected-color: var(--grey-46); - --border-pagination-color: var(--grey-19); - --border-pagination-span-color: var(--grey-19); - --border-pagination-hover-color: var(--grey-19); + --border-pagination-color: var(--ui-white); + --border-pagination-span-color: var(--ui-white); + --border-pagination-hover-color: var(--ui-white); --border-multiselect-button-color: var(--grey-48); --border-searchbar-color: var(--grey-10); --border-panel-color: var(--white-color); @@ -309,8 +314,8 @@ --bg-blocklist-item-selected-color: var(--grey-3); --bg-progress-color: var(--grey-3); --bg-pagination-color: var(--grey-3); - --bg-pagination-span-color: var(--grey-3); - --bg-pagination-hover-color: var(--grey-4); + --bg-pagination-span-color: var(--grey-1); + --bg-pagination-hover-color: var(--grey-3); --bg-ui-select-hover-color: var(--grey-3); --bg-motd-body-color: var(--grey-1); --bg-item-highlighted-color: var(--grey-2); @@ -346,6 +351,8 @@ --bg-inputbox: var(--grey-2); --bg-dropdown-hover: var(--grey-3); --bg-webeditor-color: var(--ui-gray-warm-9); + --bg-button-group-color: var(--ui-black); + --bg-pagination-disabled-color: var(--grey-1); --text-main-color: var(--white-color); --text-body-color: var(--white-color); @@ -376,8 +383,8 @@ --text-blocklist-item-selected-color: var(--white-color); --text-progress-bar-color: var(--white-color); --text-pagination-color: var(--white-color); - --text-pagination-span-color: var(--ui-gray-3); - --text-pagination-span-hover-color: var(--white-color); + --text-pagination-span-color: var(--ui-white); + --text-pagination-span-hover-color: var(--ui-white); --text-ui-select-color: var(--white-color); --text-ui-select-hover-color: var(--white-color); --text-summary-color: var(--white-color); @@ -393,6 +400,8 @@ --text-button-hover-color: var(--white-color); --text-small-select-color: var(--grey-7); --text-bootbox: var(--white-color); + --text-button-group-color: var(--ui-white); + --text-button-dangerlight-color: var(--ui-error-7); --border-color: var(--grey-3); --border-widget-color: var(--grey-1); @@ -413,8 +422,7 @@ --border-codemirror-gutters-color: var(--grey-26); --border-pre-color: var(--grey-3); --border-blocklist-item-selected-color: var(--grey-38); - --border-pagination-color: var(--grey-3); - --border-pagination-span-color: var(--grey-3); + --border-pagination-span-color: var(--grey-1); --border-pagination-hover-color: var(--grey-3); --border-boxselector-wrapper-hover: 3px solid var(--blue-8); --border-panel-color: var(--grey-2); @@ -429,6 +437,7 @@ --border-bootbox: var(--ui-gray-9); --border-blocklist: var(--ui-gray-9); --border-widget: var(--ui-gray-9); + --border-pagination-color: var(--grey-1); --blue-color: var(--blue-2); --button-close-color: var(--white-color); @@ -494,7 +503,7 @@ --bg-inner-datatable-thead: var(--black-color); --bg-service-datatable-tbody: var(--black-color); --bg-pagination-color: var(--grey-3); - --bg-pagination-span-color: var(--grey-3); + --bg-pagination-span-color: var(--ui-black); --bg-multiselect-color: var(--grey-1); --bg-daterangepicker-color: var(--black-color); --bg-calendar-color: var(--black-color); @@ -529,6 +538,8 @@ --bg-searchbar: var(--black-color); --bg-dropdown-hover: var(--black-color); --bg-webeditor-color: var(--ui-gray-warm-9); + --bg-pagination-disabled-color: var(--ui-black); + --bg-pagination-hover-color: var(--ui-black); --text-main-color: var(--white-color); --text-body-color: var(--white-color); @@ -569,8 +580,10 @@ --text-btn-default-color: var(--white-color); --text-small-select-color: var(--white-color); --text-multiselect-item-color: var(--white-color); - --text-pagination-span-color: var(--ui-gray-3); + --text-pagination-span-color: var(--ui-white); --text-bootbox: var(--white-color); + --text-button-dangerlight-color: var(--ui-error-7); + --text-pagination-span-hover-color: var(--ui-white); --border-color: var(--grey-55); --border-widget-color: var(--white-color); @@ -587,8 +600,8 @@ --border-input-group-addon-color: var(--grey-54); --border-modal-header-color: var(--grey-3); --border-input-sm-color: var(--white-color); - --border-pagination-color: var(--grey-3); - --border-pagination-span-color: var(--grey-3); + --border-pagination-color: var(--grey-1); + --border-pagination-span-color: var(--grey-1); --border-daterangepicker-color: var(--white-color); --border-calendar-table: var(--black-color); --border-daterangepicker: var(--black-color); diff --git a/app/assets/ico/arrow-right-long.svg b/app/assets/ico/arrow-right-long.svg index 2187c8cc8..8a33010b7 100644 --- a/app/assets/ico/arrow-right-long.svg +++ b/app/assets/ico/arrow-right-long.svg @@ -1,3 +1 @@ - - - + \ No newline at end of file diff --git a/app/assets/ico/arrows-updown.svg b/app/assets/ico/arrows-updown.svg index 2c1e338e7..aee24d178 100644 --- a/app/assets/ico/arrows-updown.svg +++ b/app/assets/ico/arrows-updown.svg @@ -1,3 +1 @@ - - - + \ No newline at end of file diff --git a/app/assets/ico/asterisk.svg b/app/assets/ico/asterisk.svg index 6fae4e393..06f448415 100644 --- a/app/assets/ico/asterisk.svg +++ b/app/assets/ico/asterisk.svg @@ -1,3 +1 @@ - - - + \ No newline at end of file diff --git a/app/assets/ico/bomb.svg b/app/assets/ico/bomb.svg index f37412fe1..eb56b51e7 100644 --- a/app/assets/ico/bomb.svg +++ b/app/assets/ico/bomb.svg @@ -1,5 +1 @@ - - - - - + \ No newline at end of file diff --git a/app/assets/ico/circle-notch.svg b/app/assets/ico/circle-notch.svg index cda549053..673847ce8 100644 --- a/app/assets/ico/circle-notch.svg +++ b/app/assets/ico/circle-notch.svg @@ -1,3 +1 @@ - - - + \ No newline at end of file diff --git a/app/assets/ico/clock-rewind.svg b/app/assets/ico/clock-rewind.svg index ab343c445..0e805daa5 100644 --- a/app/assets/ico/clock-rewind.svg +++ b/app/assets/ico/clock-rewind.svg @@ -1,3 +1 @@ - - - + \ No newline at end of file diff --git a/app/assets/ico/compress.svg b/app/assets/ico/compress.svg index 4141bb1a2..904b0106b 100644 --- a/app/assets/ico/compress.svg +++ b/app/assets/ico/compress.svg @@ -1,3 +1 @@ - - - + \ No newline at end of file diff --git a/app/assets/ico/cubes.svg b/app/assets/ico/cubes.svg new file mode 100644 index 000000000..15c9ab421 --- /dev/null +++ b/app/assets/ico/cubes.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/assets/ico/dataflow-1.svg b/app/assets/ico/dataflow-1.svg index 2513bad3f..4e9f50661 100644 --- a/app/assets/ico/dataflow-1.svg +++ b/app/assets/ico/dataflow-1.svg @@ -1,3 +1 @@ - - - + \ No newline at end of file diff --git a/app/assets/ico/dataflow-2.svg b/app/assets/ico/dataflow-2.svg index a209ee2d7..1424f8c5a 100644 --- a/app/assets/ico/dataflow-2.svg +++ b/app/assets/ico/dataflow-2.svg @@ -1,3 +1 @@ - - - + \ No newline at end of file diff --git a/app/assets/ico/expand.svg b/app/assets/ico/expand.svg index e80c83dc2..611acda9f 100644 --- a/app/assets/ico/expand.svg +++ b/app/assets/ico/expand.svg @@ -1,3 +1 @@ - - - + \ No newline at end of file diff --git a/app/assets/ico/file-code.svg b/app/assets/ico/file-code.svg index 5aef486dc..4b7cd7291 100644 --- a/app/assets/ico/file-code.svg +++ b/app/assets/ico/file-code.svg @@ -1,3 +1 @@ - - - + \ No newline at end of file diff --git a/app/assets/ico/file-signature.svg b/app/assets/ico/file-signature.svg index 0d23dec00..24dbe9b36 100644 --- a/app/assets/ico/file-signature.svg +++ b/app/assets/ico/file-signature.svg @@ -1,3 +1 @@ - - - + \ No newline at end of file diff --git a/app/assets/ico/file-upload.svg b/app/assets/ico/file-upload.svg index e684fcb61..4b7cd7291 100644 --- a/app/assets/ico/file-upload.svg +++ b/app/assets/ico/file-upload.svg @@ -1,3 +1 @@ - - - + \ No newline at end of file diff --git a/app/assets/ico/filter-lines.svg b/app/assets/ico/filter-lines.svg new file mode 100644 index 000000000..03081d508 --- /dev/null +++ b/app/assets/ico/filter-lines.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/assets/ico/flask.svg b/app/assets/ico/flask.svg index 4971b5886..23e84d1e8 100644 --- a/app/assets/ico/flask.svg +++ b/app/assets/ico/flask.svg @@ -1,3 +1,3 @@ - \ No newline at end of file + diff --git a/app/assets/ico/heartbeat.svg b/app/assets/ico/heartbeat.svg index 832fa75bb..4488a0358 100644 --- a/app/assets/ico/heartbeat.svg +++ b/app/assets/ico/heartbeat.svg @@ -1,3 +1 @@ - - - + \ No newline at end of file diff --git a/app/assets/ico/helm.svg b/app/assets/ico/helm.svg new file mode 100644 index 000000000..a6dcc4034 --- /dev/null +++ b/app/assets/ico/helm.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/assets/ico/kube.svg b/app/assets/ico/kube.svg new file mode 100644 index 000000000..17c2765bb --- /dev/null +++ b/app/assets/ico/kube.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/assets/ico/laptop-code.svg b/app/assets/ico/laptop-code.svg index 0523bd4f2..18975e702 100644 --- a/app/assets/ico/laptop-code.svg +++ b/app/assets/ico/laptop-code.svg @@ -1,4 +1 @@ - - - - + \ No newline at end of file diff --git a/app/assets/ico/laptop.svg b/app/assets/ico/laptop.svg index 38a427f6e..4b3908d1d 100644 --- a/app/assets/ico/laptop.svg +++ b/app/assets/ico/laptop.svg @@ -1,3 +1 @@ - - - + \ No newline at end of file diff --git a/app/assets/ico/magic.svg b/app/assets/ico/magic.svg new file mode 100644 index 000000000..d72837a28 --- /dev/null +++ b/app/assets/ico/magic.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/assets/ico/palette.svg b/app/assets/ico/palette.svg index 0cc5445b7..0bc8845b2 100644 --- a/app/assets/ico/palette.svg +++ b/app/assets/ico/palette.svg @@ -1,6 +1 @@ - - - - - - + \ No newline at end of file diff --git a/app/assets/ico/plug.svg b/app/assets/ico/plug.svg index a1b0c3d61..9d9b0e90b 100644 --- a/app/assets/ico/plug.svg +++ b/app/assets/ico/plug.svg @@ -1,3 +1 @@ - - - + \ No newline at end of file diff --git a/app/assets/ico/restore-window.svg b/app/assets/ico/restore-window.svg index 32167f42d..55e737987 100644 --- a/app/assets/ico/restore-window.svg +++ b/app/assets/ico/restore-window.svg @@ -1,3 +1 @@ - - - + \ No newline at end of file diff --git a/app/assets/ico/restore.svg b/app/assets/ico/restore.svg index ecb60fec2..c34cc7c4d 100644 --- a/app/assets/ico/restore.svg +++ b/app/assets/ico/restore.svg @@ -1,3 +1 @@ - - - + \ No newline at end of file diff --git a/app/assets/ico/rocket.svg b/app/assets/ico/rocket.svg index 5048b7f31..fc1c9d3bf 100644 --- a/app/assets/ico/rocket.svg +++ b/app/assets/ico/rocket.svg @@ -1,3 +1 @@ - - - + \ No newline at end of file diff --git a/app/assets/ico/share.svg b/app/assets/ico/share.svg index a63e76834..76cfe1c4b 100644 --- a/app/assets/ico/share.svg +++ b/app/assets/ico/share.svg @@ -1,3 +1 @@ - - - + \ No newline at end of file diff --git a/app/assets/ico/sort.svg b/app/assets/ico/sort.svg index 2a768c76c..337094b8b 100644 --- a/app/assets/ico/sort.svg +++ b/app/assets/ico/sort.svg @@ -1,3 +1 @@ - - - + \ No newline at end of file diff --git a/app/assets/ico/tachometer.svg b/app/assets/ico/tachometer.svg index c3e722c10..e63266ec2 100644 --- a/app/assets/ico/tachometer.svg +++ b/app/assets/ico/tachometer.svg @@ -1,3 +1,3 @@ - \ No newline at end of file + diff --git a/app/assets/ico/tag-2.svg b/app/assets/ico/tag-2.svg index 20fa123a6..fbe3acac2 100644 --- a/app/assets/ico/tag-2.svg +++ b/app/assets/ico/tag-2.svg @@ -1,3 +1 @@ - - - + \ No newline at end of file diff --git a/app/assets/ico/tags.svg b/app/assets/ico/tags.svg index 6edfc7862..dc109152c 100644 --- a/app/assets/ico/tags.svg +++ b/app/assets/ico/tags.svg @@ -1,3 +1 @@ - - - + \ No newline at end of file diff --git a/app/assets/ico/tools.svg b/app/assets/ico/tools.svg index 23d0995fe..dbe32e431 100644 --- a/app/assets/ico/tools.svg +++ b/app/assets/ico/tools.svg @@ -1,3 +1 @@ - - - + \ No newline at end of file diff --git a/app/assets/ico/user-circle.svg b/app/assets/ico/user-circle.svg index 075cbfe34..6d1c964c2 100644 --- a/app/assets/ico/user-circle.svg +++ b/app/assets/ico/user-circle.svg @@ -1,3 +1 @@ - - - + \ No newline at end of file diff --git a/app/assets/ico/user-lock.svg b/app/assets/ico/user-lock.svg index 1b191f7dd..cbebf89af 100644 --- a/app/assets/ico/user-lock.svg +++ b/app/assets/ico/user-lock.svg @@ -1,5 +1 @@ - - - - - + \ No newline at end of file diff --git a/app/assets/ico/user-secret.svg b/app/assets/ico/user-secret.svg new file mode 100644 index 000000000..047f44879 --- /dev/null +++ b/app/assets/ico/user-secret.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/docker/components/datatables/images-datatable/imagesDatatable.html b/app/docker/components/datatables/images-datatable/imagesDatatable.html index 2281780a2..fecf91195 100644 --- a/app/docker/components/datatables/images-datatable/imagesDatatable.html +++ b/app/docker/components/datatables/images-datatable/imagesDatatable.html @@ -58,24 +58,24 @@
diff --git a/app/docker/components/datatables/services-datatable/actions/servicesDatatableActions.html b/app/docker/components/datatables/services-datatable/actions/servicesDatatableActions.html index 0ce250690..78c238955 100644 --- a/app/docker/components/datatables/services-datatable/actions/servicesDatatableActions.html +++ b/app/docker/components/datatables/services-datatable/actions/servicesDatatableActions.html @@ -9,7 +9,7 @@ ng-click="$ctrl.updateAction($ctrl.selectedItems)" data-cy="service-updateServiceButton" > - Update + Update
diff --git a/app/portainer/components/forms/registry-form-custom/registry-form-custom.html b/app/portainer/components/forms/registry-form-custom/registry-form-custom.html index c37c4fd1c..9a9ece6b1 100644 --- a/app/portainer/components/forms/registry-form-custom/registry-form-custom.html +++ b/app/portainer/components/forms/registry-form-custom/registry-form-custom.html @@ -60,6 +60,7 @@ name="'administrator'" checked="$ctrl.model.Authentication" on-change="($ctrl.toggleAuthentication)" + label-class="'col-sm-2'" > diff --git a/app/portainer/components/forms/registry-form-quay/registry-form-quay.html b/app/portainer/components/forms/registry-form-quay/registry-form-quay.html index 313af28d4..54eb91460 100644 --- a/app/portainer/components/forms/registry-form-quay/registry-form-quay.html +++ b/app/portainer/components/forms/registry-form-quay/registry-form-quay.html @@ -63,10 +63,10 @@
diff --git a/app/portainer/components/widget/rd-widget-title.ts b/app/portainer/components/widget/rd-widget-title.ts index 2bbf5ee22..639e2bbdf 100644 --- a/app/portainer/components/widget/rd-widget-title.ts +++ b/app/portainer/components/widget/rd-widget-title.ts @@ -14,7 +14,7 @@ export const rdWidgetTitle = {
- + {{ $ctrl.titleText }} diff --git a/app/portainer/views/settings/authentication/settingsAuthentication.html b/app/portainer/views/settings/authentication/settingsAuthentication.html index 2e12f0c80..bf281d601 100644 --- a/app/portainer/views/settings/authentication/settingsAuthentication.html +++ b/app/portainer/views/settings/authentication/settingsAuthentication.html @@ -22,7 +22,7 @@
- Changing from default is only recommended if you have additional layers of authentication in front of Portainer. diff --git a/app/react/components/PageHeader/Breadcrumbs/Breadcrumbs.css b/app/react/components/PageHeader/Breadcrumbs/Breadcrumbs.css index e1a2826ff..f64c861a9 100644 --- a/app/react/components/PageHeader/Breadcrumbs/Breadcrumbs.css +++ b/app/react/components/PageHeader/Breadcrumbs/Breadcrumbs.css @@ -1,3 +1,12 @@ .breadcrumb-links { font-size: 10px; } + +.breadcrumb-links a { + color: var(--ui-blue-8); +} + +.breadcrumb-links a:hover { + text-decoration: underline; + color: var(--ui-blue-9); +} diff --git a/app/react/components/PaginationControls/pagination-controls.css b/app/react/components/PaginationControls/pagination-controls.css index fa15086d9..8a7b78f48 100644 --- a/app/react/components/PaginationControls/pagination-controls.css +++ b/app/react/components/PaginationControls/pagination-controls.css @@ -22,7 +22,7 @@ .pagination > .disabled > a:hover, .pagination > .disabled > a:focus { color: var(--text-pagination-color); - background-color: var(--bg-pagination-color); + background-color: var(--bg-pagination-disabled-color); border-color: var(--border-pagination-color); } @@ -33,7 +33,7 @@ margin-left: -1px !important; line-height: 1.42857143; text-decoration: none; - border: 1px solid #ddd; + border: 1px solid var(--ui-white); } .pagination > li > a, @@ -41,7 +41,7 @@ .pagination > li > span { background-color: var(--bg-pagination-span-color); border-color: var(--border-pagination-span-color); - color: var(--text-pagination-span-color); + color: var(--text-pagination-span-color) !important; } .pagination > li > a:hover, @@ -53,6 +53,7 @@ background-color: var(--bg-pagination-hover-color); border-color: var(--border-pagination-hover-color); color: var(--text-pagination-span-hover-color); + border-radius: 8px; } .pagination > .active > a, @@ -67,6 +68,9 @@ @apply text-blue-7; z-index: 3; cursor: default; - background-color: var(--text-pagination-span-color); - border-color: var(--text-pagination-span-color); + /* background-color: var(--text-pagination-span-color); */ + background-color: var(--bg-pagination-color); + border-radius: 8px; + color: var(--text-pagination-span-hover-color) !important; + border-color: var(--border-pagination-span-color); } diff --git a/app/react/components/Tip/TextTip/TextTip.tsx b/app/react/components/Tip/TextTip/TextTip.tsx index 2dfd7c196..964dc6f76 100644 --- a/app/react/components/Tip/TextTip/TextTip.tsx +++ b/app/react/components/Tip/TextTip/TextTip.tsx @@ -1,5 +1,5 @@ -import { PropsWithChildren } from 'react'; import clsx from 'clsx'; +import { PropsWithChildren } from 'react'; import { Icon } from '@@/Icon'; diff --git a/app/timeout.ejs b/app/timeout.ejs index fad7fe672..4d4717077 100644 --- a/app/timeout.ejs +++ b/app/timeout.ejs @@ -45,7 +45,7 @@

- For further information, view our documentation. + For further information, view our documentation.