From 1896df2cfb285de6d376d1d9c549d1d69f2bd2d7 Mon Sep 17 00:00:00 2001 From: Will Sun <30999793+AllForNothing@users.noreply.github.com> Date: Wed, 19 May 2021 12:49:38 +0800 Subject: [PATCH] Improve css style (#14909) Signed-off-by: AllForNothing --- .../harbor-shell/harbor-shell.component.html | 2 +- .../projects/projects.component.scss | 3 +-- .../statistics-panel.component.html | 2 +- .../statistics-panel.component.scss | 5 ----- .../project-detail.component.html | 4 ++-- .../tag-feature-integration.component.html | 8 ++++---- .../tag-feature-integration.component.scss | 3 +++ .../components/push-image/push-image.scss | 2 +- src/portal/src/app/shared/units/utils.spec.ts | 2 +- src/portal/src/app/shared/units/utils.ts | 2 +- src/portal/src/css/common.scss | 20 +++++++++++++++++++ src/portal/src/css/dark-theme.scss | 2 ++ src/portal/src/css/light-theme.scss | 2 ++ 13 files changed, 39 insertions(+), 18 deletions(-) diff --git a/src/portal/src/app/base/harbor-shell/harbor-shell.component.html b/src/portal/src/app/base/harbor-shell/harbor-shell.component.html index 19a54bebe..53aa7fae4 100644 --- a/src/portal/src/app/base/harbor-shell/harbor-shell.component.html +++ b/src/portal/src/app/base/harbor-shell/harbor-shell.component.html @@ -62,7 +62,7 @@ {{'SIDE_NAV.SYSTEM_MGMT.REPLICATION' | translate}} - + {{'SIDE_NAV.DISTRIBUTIONS.NAME' | translate}} {{'STATISTICS.STORAGE_USED' | translate }}
- {{getSizeNumber()}}{{getSizeUnit()}} + {{getSizeNumber()}}{{getSizeUnit()}}
diff --git a/src/portal/src/app/base/left-side-nav/projects/statictics/statistics-panel.component.scss b/src/portal/src/app/base/left-side-nav/projects/statictics/statistics-panel.component.scss index e0ba3f852..bdd907b39 100644 --- a/src/portal/src/app/base/left-side-nav/projects/statictics/statistics-panel.component.scss +++ b/src/portal/src/app/base/left-side-nav/projects/statictics/statistics-panel.component.scss @@ -7,11 +7,6 @@ margin-right: 0.5rem; margin-top: 0; } - -.card:last-child{ - width: 10rem; - margin-right: 0; -} .flex-end { justify-content: flex-end; } diff --git a/src/portal/src/app/base/project/project-detail/project-detail.component.html b/src/portal/src/app/base/project/project-detail/project-detail.component.html index fbe1ee7d7..a4d9883e3 100644 --- a/src/portal/src/app/base/project/project-detail/project-detail.component.html +++ b/src/portal/src/app/base/project/project-detail/project-detail.component.html @@ -1,6 +1,6 @@ < {{'PROJECT_DETAIL.PROJECTS' | translate}} - {{'SEARCH.BACK' | translate}} + {{'SEARCH.BACK' | translate}}

@@ -32,7 +32,7 @@

{{getSizeNumber()}} - {{getSizeUnit()}} + {{getSizeUnit()}}

{{ 'QUOTA.OF' | translate }} {{ projectQuota?.hard?.storage ===-1? ('QUOTA.UNLIMITED' | translate) : getIntegerAndUnit(projectQuota?.hard?.storage, projectQuota?.used?.storage).partNumberHard }} diff --git a/src/portal/src/app/base/project/tag-feature-integration/tag-feature-integration.component.html b/src/portal/src/app/base/project/tag-feature-integration/tag-feature-integration.component.html index f61df41a8..ff8393aa0 100644 --- a/src/portal/src/app/base/project/tag-feature-integration/tag-feature-integration.component.html +++ b/src/portal/src/app/base/project/tag-feature-integration/tag-feature-integration.component.html @@ -1,11 +1,11 @@
-
+
- +
-
+
- +
diff --git a/src/portal/src/app/base/project/tag-feature-integration/tag-feature-integration.component.scss b/src/portal/src/app/base/project/tag-feature-integration/tag-feature-integration.component.scss index a31f75ede..c1e3926a8 100644 --- a/src/portal/src/app/base/project/tag-feature-integration/tag-feature-integration.component.scss +++ b/src/portal/src/app/base/project/tag-feature-integration/tag-feature-integration.component.scss @@ -10,3 +10,6 @@ text-decoration: none; } } +.checked { + color: #fff; +} diff --git a/src/portal/src/app/shared/components/push-image/push-image.scss b/src/portal/src/app/shared/components/push-image/push-image.scss index 91f9d9952..3f35e6f0f 100644 --- a/src/portal/src/app/shared/components/push-image/push-image.scss +++ b/src/portal/src/app/shared/components/push-image/push-image.scss @@ -40,7 +40,7 @@ } .btn-font { - font-size: 13px !important; + font-size: 14px !important; } .hide{ display:none; diff --git a/src/portal/src/app/shared/units/utils.spec.ts b/src/portal/src/app/shared/units/utils.spec.ts index bfb948852..4d24a4b02 100644 --- a/src/portal/src/app/shared/units/utils.spec.ts +++ b/src/portal/src/app/shared/units/utils.spec.ts @@ -65,7 +65,7 @@ describe('functions in utils.ts should work', () => { it('function getSizeUnit() should work', () => { expect(getSizeUnit).toBeTruthy(); expect(getSizeUnit(4564)).toEqual('KB'); - expect(getSizeUnit(10)).toEqual('B'); + expect(getSizeUnit(10)).toEqual('Byte'); expect(getSizeUnit(4564000)).toEqual('MB'); expect(getSizeUnit(4564000000)).toEqual('GB'); }); diff --git a/src/portal/src/app/shared/units/utils.ts b/src/portal/src/app/shared/units/utils.ts index bf3593fbb..8a1e617c3 100644 --- a/src/portal/src/app/shared/units/utils.ts +++ b/src/portal/src/app/shared/units/utils.ts @@ -607,7 +607,7 @@ export function getSizeUnit(size: number): string { } else if (Math.pow(1024, 3) <= size && size < Math.pow(1024, 4)) { return "GB"; } else { - return "B"; + return "Byte"; } } diff --git a/src/portal/src/css/common.scss b/src/portal/src/css/common.scss index 8894c3c35..aee5b3aa3 100644 --- a/src/portal/src/css/common.scss +++ b/src/portal/src/css/common.scss @@ -255,3 +255,23 @@ artifact-list-tab { .central-block-loading { background-color: $central-block-loading-bg-color; } +.backStyle { + color: $back-link-color; +} +.back-icon { + color: $back-link-color; +} +.breadcrumb a { + color: $back-link-color; +} +.arrow-block a{ + color: $back-link-color; +} +.onback { + color: $back-link-color; +} +app-tag-feature-integration { + .checked { + background-color: $radio-button-checked; + } +} diff --git a/src/portal/src/css/dark-theme.scss b/src/portal/src/css/dark-theme.scss index 5688167e0..6f9eaa74e 100644 --- a/src/portal/src/css/dark-theme.scss +++ b/src/portal/src/css/dark-theme.scss @@ -41,4 +41,6 @@ $label-hover-bg-color: #28404d; $nav-divider-bg-color: #fafafa; $label-color-input: #ddd; $central-block-loading-bg-color: rgba(0, 0, 0, 0.5); +$back-link-color: #4aaed9!important; +$radio-button-checked: #4aaed9; @import "./common.scss"; diff --git a/src/portal/src/css/light-theme.scss b/src/portal/src/css/light-theme.scss index 8aab96c90..110dc9b96 100644 --- a/src/portal/src/css/light-theme.scss +++ b/src/portal/src/css/light-theme.scss @@ -43,4 +43,6 @@ $label-hover-bg-color: #eee; $nav-divider-bg-color: #000; $label-color-input: #5d5d5d; $central-block-loading-bg-color: rgba(255, 255, 255, 0.5); +$back-link-color: none; +$radio-button-checked: #0072a3; @import "./common.scss";