From 0c756d8df9567e679fb29b4b95b6049497baf6d5 Mon Sep 17 00:00:00 2001 From: Qian Deng Date: Fri, 26 Oct 2018 16:09:30 +0800 Subject: [PATCH 1/2] Fix: Icon is not at the center of button Icon in the action bar button need be a certer position Signed-off-by: Qian Deng --- .../src/helm-chart/versions/helm-chart-version.component.scss | 4 +++- src/portal/lib/src/tag/tag-detail.component.html | 1 - 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/portal/lib/src/helm-chart/versions/helm-chart-version.component.scss b/src/portal/lib/src/helm-chart/versions/helm-chart-version.component.scss index cfb766fdd..27a21a5d1 100644 --- a/src/portal/lib/src/helm-chart/versions/helm-chart-version.component.scss +++ b/src/portal/lib/src/helm-chart/versions/helm-chart-version.component.scss @@ -35,7 +35,9 @@ clr-dg-action-bar { clr-dropdown { - @include dropdown-as-action-button; + .btn { + @include dropdown-as-action-button; + } } } diff --git a/src/portal/lib/src/tag/tag-detail.component.html b/src/portal/lib/src/tag/tag-detail.component.html index 4e32960bb..4c81260b2 100644 --- a/src/portal/lib/src/tag/tag-detail.component.html +++ b/src/portal/lib/src/tag/tag-detail.component.html @@ -67,7 +67,6 @@ -
{{'TAG.LABELS' | translate }}
From 4aa625e1a6e4268333aaaf2b94b7939915a89073 Mon Sep 17 00:00:00 2001 From: Qian Deng Date: Mon, 29 Oct 2018 10:47:23 +0800 Subject: [PATCH 2/2] Fix: Centering Label in the dropdown item Label in drop down should position in ther vertical center Signed-off-by: Qian Deng --- .../label-marker/label-marker.component.html | 16 ++++----- .../label-marker/label-marker.component.scss | 35 +++++++++++++------ 2 files changed, 33 insertions(+), 18 deletions(-) diff --git a/src/portal/lib/src/label/label-marker/label-marker.component.html b/src/portal/lib/src/label/label-marker/label-marker.component.html index 7ea3ad612..64ac987a5 100644 --- a/src/portal/lib/src/label/label-marker/label-marker.component.html +++ b/src/portal/lib/src/label/label-marker/label-marker.component.html @@ -5,18 +5,18 @@
\ No newline at end of file diff --git a/src/portal/lib/src/label/label-marker/label-marker.component.scss b/src/portal/lib/src/label/label-marker/label-marker.component.scss index 90b23ae43..281d01221 100644 --- a/src/portal/lib/src/label/label-marker/label-marker.component.scss +++ b/src/portal/lib/src/label/label-marker/label-marker.component.scss @@ -1,12 +1,16 @@ @mixin icon-span { - width: 12px; - min-height: 12px; + width: 16px; + height: 16px; clr-icon { - margin-bottom: 12px; + margin-bottom: 3px; } } +@mixin flex-item { + display: inline-block; +} + .filter-div { margin-left: 9px; margin-right: 9px; @@ -21,16 +25,27 @@ padding-left: 12px; padding-right: 12px; - .unmark-label-span { - @include icon-span(); - float: right; - } - - .mark-label-span { + .mark-label-div { @include icon-span(); + @include flex-item(); float: left; margin-right: 9px; } - } + .spinner { + @include flex-item(); + } + + .label-div { + @include flex-item(); + + margin-top: 4px; + } + + .unmark-label-div { + @include icon-span(); + @include flex-item(); + float: right; + } + } } \ No newline at end of file