diff --git a/app/assets/css/app.css b/app/assets/css/app.css index 40484b180..25e3e257c 100644 --- a/app/assets/css/app.css +++ b/app/assets/css/app.css @@ -482,12 +482,6 @@ json-tree .branch-preview { .pagination > li > span:focus { background-color: var(--bg-pagination-hover-color); border-color: var(--border-pagination-hover-color); -} - -.pagination > li > a:hover, -.pagination > li > span:hover, -.pagination > li > a:focus, -.pagination > li > span:focus { color: var(--text-pagination-span-hover-color); } diff --git a/app/docker/components/datatables/container-networks-datatable/containerNetworksDatatable.html b/app/docker/components/datatables/container-networks-datatable/containerNetworksDatatable.html index 77ce34153..aafdcb42f 100644 --- a/app/docker/components/datatables/container-networks-datatable/containerNetworksDatatable.html +++ b/app/docker/components/datatables/container-networks-datatable/containerNetworksDatatable.html @@ -73,7 +73,11 @@ - + {{ value.GlobalIPv6Address }} diff --git a/app/docker/components/datatables/networks-datatable/networksDatatable.html b/app/docker/components/datatables/networks-datatable/networksDatatable.html index bf54ca837..59ae18ad1 100644 --- a/app/docker/components/datatables/networks-datatable/networksDatatable.html +++ b/app/docker/components/datatables/networks-datatable/networksDatatable.html @@ -171,7 +171,16 @@ allow-checkbox="true" > - + + Loading... diff --git a/app/docker/components/datatables/service-tasks-datatable/serviceTasksDatatable.html b/app/docker/components/datatables/service-tasks-datatable/serviceTasksDatatable.html index 285f2263e..21b8498f9 100644 --- a/app/docker/components/datatables/service-tasks-datatable/serviceTasksDatatable.html +++ b/app/docker/components/datatables/service-tasks-datatable/serviceTasksDatatable.html @@ -1,4 +1,4 @@ -
+
diff --git a/app/kubernetes/components/datatables/applications-ports-datatable/applicationsPortsDatatable.html b/app/kubernetes/components/datatables/applications-ports-datatable/applicationsPortsDatatable.html index 814ff9ebf..d9095e660 100644 --- a/app/kubernetes/components/datatables/applications-ports-datatable/applicationsPortsDatatable.html +++ b/app/kubernetes/components/datatables/applications-ports-datatable/applicationsPortsDatatable.html @@ -106,7 +106,7 @@ @@ -177,7 +177,11 @@ - + @@ -190,7 +194,12 @@ - + diff --git a/app/kubernetes/components/datatables/applications-stacks-datatable/applicationsStacksDatatable.html b/app/kubernetes/components/datatables/applications-stacks-datatable/applicationsStacksDatatable.html index d49c972c8..80a3d924e 100644 --- a/app/kubernetes/components/datatables/applications-stacks-datatable/applicationsStacksDatatable.html +++ b/app/kubernetes/components/datatables/applications-stacks-datatable/applicationsStacksDatatable.html @@ -110,7 +110,7 @@ @@ -141,7 +141,12 @@ Logs - + @@ -92,14 +92,23 @@ - + - + @@ -110,7 +119,7 @@ ng-if="$ctrl.isAdmin" ng-show="item.Expanded" ng-repeat="label in item.UnmatchedNodeSelectorLabels" - ng-style="{ background: item.Highlighted ? '#d5e8f3' : '#f5f5f5' }" + ng-style="{ background: item.Highlighted ? 'var(--bg-item-highlighted-color)' : 'var(--bg-item-highlighted-null-color)' }" > - + @@ -139,7 +152,7 @@ ng-if="$ctrl.isAdmin" ng-show="item.Expanded" ng-repeat="aff in item.UnmatchedNodeAffinities" - ng-style="{ background: item.Highlighted ? '#d5e8f3' : '#f5f5f5' }" + ng-style="{ background: item.Highlighted ? 'var(--bg-item-highlighted-color)' : 'var(--bg-item-highlighted-null-color)' }" > @@ -84,7 +84,12 @@ >{{ item.Name }} - + @@ -95,7 +95,12 @@ - +
- -{{ port.TargetPort }}/{{ port.Protocol }} -
- -
{{ app.Name }} diff --git a/app/kubernetes/views/applications/edit/components/placements-datatable/template.html b/app/kubernetes/views/applications/edit/components/placements-datatable/template.html index 50bd58670..33581dd21 100644 --- a/app/kubernetes/views/applications/edit/components/placements-datatable/template.html +++ b/app/kubernetes/views/applications/edit/components/placements-datatable/template.html @@ -76,7 +76,7 @@
This application is missing a toleration for the taint {{ taint.Key }}{{ taint.Value ? '=' + taint.Value : '' }}:{{ taint.Effect }}
Placement constraint not respected for that node. This application can only be scheduled on a node where the label {{ label.key }} is set to {{ label.value }} @@ -121,7 +130,7 @@
Placement label not respected for that node. @@ -129,7 +138,11 @@
This application can only be scheduled on nodes respecting one of the following labels combination: diff --git a/app/kubernetes/views/resource-pools/edit/components/ingresses-datatable/template.html b/app/kubernetes/views/resource-pools/edit/components/ingresses-datatable/template.html index ef78e3734..d86e268e1 100644 --- a/app/kubernetes/views/resource-pools/edit/components/ingresses-datatable/template.html +++ b/app/kubernetes/views/resource-pools/edit/components/ingresses-datatable/template.html @@ -74,7 +74,7 @@
{{ path.Host ? path.Host : path.IP }}{{ path.Path }} diff --git a/app/kubernetes/views/volumes/components/volumes-storages-datatable/template.html b/app/kubernetes/views/volumes/components/volumes-storages-datatable/template.html index b0130ab5c..3b6e24a28 100644 --- a/app/kubernetes/views/volumes/components/volumes-storages-datatable/template.html +++ b/app/kubernetes/views/volumes/components/volumes-storages-datatable/template.html @@ -83,7 +83,7 @@
{{ item.Name }} {{ item.Size }}