diff --git a/src/portal/lib/src/config/registry-config.component.scss b/src/portal/lib/src/config/registry-config.component.scss index dfed30a8c..609b59702 100644 --- a/src/portal/lib/src/config/registry-config.component.scss +++ b/src/portal/lib/src/config/registry-config.component.scss @@ -4,4 +4,18 @@ .info-tips-icon:hover { color: #007CBB; +} + +.replication-config { + margin-top: 0; + margin-bottom: 0; +} + +.replication-text { + font-size: 14px; + font-weight: 600; +} + +.replication-tooltip { + top: -8px; } \ No newline at end of file diff --git a/src/portal/lib/src/config/replication/replication-config.component.html b/src/portal/lib/src/config/replication/replication-config.component.html index f3f7d31b7..c5276a58a 100644 --- a/src/portal/lib/src/config/replication/replication-config.component.html +++ b/src/portal/lib/src/config/replication/replication-config.component.html @@ -1,10 +1,10 @@
-
- +
+
- + {{'CONFIG.TOOLTIP.VERIFY_REMOTE_CERT' | translate }} diff --git a/src/portal/lib/src/config/system/system-settings.component.html b/src/portal/lib/src/config/system/system-settings.component.html index 11e35581e..7b433c7d8 100644 --- a/src/portal/lib/src/config/system/system-settings.component.html +++ b/src/portal/lib/src/config/system/system-settings.component.html @@ -1,6 +1,6 @@ -
- +
+
@@ -9,7 +9,7 @@
- + {{'CONFIG.TOOLTIP.PRO_CREATION_RESTRICTION' | translate}} @@ -40,7 +40,7 @@
- + {{'CONFIG.TOOLTIP.REPO_TOOLTIP' | translate}} diff --git a/src/portal/lib/src/config/system/system-settings.component.scss b/src/portal/lib/src/config/system/system-settings.component.scss index e69de29bb..96d0e31e1 100644 --- a/src/portal/lib/src/config/system/system-settings.component.scss +++ b/src/portal/lib/src/config/system/system-settings.component.scss @@ -0,0 +1,12 @@ +.subtitle { + font-size: 14px; + font-weight: 600; +} + +.create-tooltip { + top: -1; +} + +.read-tooltip { + top: -7px; +} \ No newline at end of file diff --git a/src/portal/lib/src/config/vulnerability/vulnerability-config.component.html b/src/portal/lib/src/config/vulnerability/vulnerability-config.component.html index cd0ce9187..2336c539a 100644 --- a/src/portal/lib/src/config/vulnerability/vulnerability-config.component.html +++ b/src/portal/lib/src/config/vulnerability/vulnerability-config.component.html @@ -1,5 +1,5 @@ -
+
@@ -9,12 +9,12 @@ {{'CONFIG.SCANNING.DB_NOT_READY' | translate }} - + - +
{{nt.namespace}} {{ convertToLocalTime(nt.last_update) | date:'MM/dd/y HH:mm:ss'}} AM diff --git a/src/portal/lib/src/config/vulnerability/vulnerability-config.component.scss b/src/portal/lib/src/config/vulnerability/vulnerability-config.component.scss index 13e8c0e9f..6db9a3c4b 100644 --- a/src/portal/lib/src/config/vulnerability/vulnerability-config.component.scss +++ b/src/portal/lib/src/config/vulnerability/vulnerability-config.component.scss @@ -22,12 +22,14 @@ font-size: 12px !important; } -.namespace { - margin-left: 24px; -} - .clr-dropdown-override { margin-top: -8px; + .dropdown-namespace { + min-width: 300px; + .namespace { + margin-left: 24px; + } + } } .btn-scan-right button{ diff --git a/src/portal/lib/src/confirmation-dialog/confirmation-dialog.component.html b/src/portal/lib/src/confirmation-dialog/confirmation-dialog.component.html index e1ca78529..520a97f11 100644 --- a/src/portal/lib/src/confirmation-dialog/confirmation-dialog.component.html +++ b/src/portal/lib/src/confirmation-dialog/confirmation-dialog.component.html @@ -1,5 +1,5 @@ -

{{dialogTitle}}

+

{{dialogTitle}}

diff --git a/src/portal/lib/src/confirmation-dialog/confirmation-dialog.component.scss b/src/portal/lib/src/confirmation-dialog/confirmation-dialog.component.scss index d16a336f9..86d752d3a 100644 --- a/src/portal/lib/src/confirmation-dialog/confirmation-dialog.component.scss +++ b/src/portal/lib/src/confirmation-dialog/confirmation-dialog.component.scss @@ -6,6 +6,7 @@ line-height: 24px; color: #000000; font-size: 22px; + margin-top: 0; } .confirmation-content { diff --git a/src/portal/lib/src/create-edit-endpoint/create-edit-endpoint.component.html b/src/portal/lib/src/create-edit-endpoint/create-edit-endpoint.component.html index 4bc0760f9..9f46f881e 100644 --- a/src/portal/lib/src/create-edit-endpoint/create-edit-endpoint.component.html +++ b/src/portal/lib/src/create-edit-endpoint/create-edit-endpoint.component.html @@ -48,7 +48,7 @@
-
+
diff --git a/src/portal/lib/src/create-edit-endpoint/create-edit-endpoint.component.scss b/src/portal/lib/src/create-edit-endpoint/create-edit-endpoint.component.scss index 44e0b0fc4..cd5c1e326 100644 --- a/src/portal/lib/src/create-edit-endpoint/create-edit-endpoint.component.scss +++ b/src/portal/lib/src/create-edit-endpoint/create-edit-endpoint.component.scss @@ -6,4 +6,8 @@ clr-tooltip { top: 3px; position: relative; + } + + .form-height { + height: 30px; } \ No newline at end of file diff --git a/src/portal/lib/src/create-edit-rule/create-edit-rule.component.html b/src/portal/lib/src/create-edit-rule/create-edit-rule.component.html index dacc3fd6b..d5570919e 100644 --- a/src/portal/lib/src/create-edit-rule/create-edit-rule.component.html +++ b/src/portal/lib/src/create-edit-rule/create-edit-rule.component.html @@ -1,7 +1,7 @@

{{headerTitle | translate}}

-
+
@@ -65,7 +65,7 @@
- +
- +
@@ -114,7 +114,7 @@
on   -
+
-
+
{{'REPLICATION.DELETE_REMOTE_IMAGES' | translate}}
-
+
{{'REPLICATION.REPLICATE_IMMEDIATE' | translate}}
-
+
diff --git a/src/portal/lib/src/create-edit-rule/create-edit-rule.component.scss b/src/portal/lib/src/create-edit-rule/create-edit-rule.component.scss index 05badda4c..b6e4eaebc 100644 --- a/src/portal/lib/src/create-edit-rule/create-edit-rule.component.scss +++ b/src/portal/lib/src/create-edit-rule/create-edit-rule.component.scss @@ -191,3 +191,27 @@ clr-modal { color: blue; } +.modal-body-height { + max-height: 85vh; +} + +.filterSelect .warning-icon { + margin-left: -15px; +} + +.plus-position { + margin-top: 11px; +} + +.weekday-width { + width: 104px; +} + +.rule-width { + width: 100%; +} + +.loading-center { + display: block; + text-align: center; +} \ No newline at end of file diff --git a/src/portal/lib/src/create-edit-rule/filter-label.component.html b/src/portal/lib/src/create-edit-rule/filter-label.component.html index a28f37924..dbf25f242 100644 --- a/src/portal/lib/src/create-edit-rule/filter-label.component.html +++ b/src/portal/lib/src/create-edit-rule/filter-label.component.html @@ -2,9 +2,9 @@ ×
-
{{'LABEL.NO_LABELS' | translate }}
+
{{'LABEL.NO_LABELS' | translate }}
-
+
@@ -18,12 +18,12 @@
- Disabled + Disabled {{'REPLICATION.RULE_DISABLED' | translate}} -
Enabled
+
Enabled
 diff --git a/src/portal/lib/src/list-replication-rule/list-replication-rule.component.scss b/src/portal/lib/src/list-replication-rule/list-replication-rule.component.scss index e69de29bb..e38cca005 100644 --- a/src/portal/lib/src/list-replication-rule/list-replication-rule.component.scss +++ b/src/portal/lib/src/list-replication-rule/list-replication-rule.component.scss @@ -0,0 +1,7 @@ +.list-rule { + padding-bottom: 15px; +} + +.text-alignment { + vertical-align: text-bottom; +} \ No newline at end of file diff --git a/src/portal/lib/src/operation/operation.component.css b/src/portal/lib/src/operation/operation.component.css index 7a53fdab0..23959da72 100644 --- a/src/portal/lib/src/operation/operation.component.css +++ b/src/portal/lib/src/operation/operation.component.css @@ -41,3 +41,27 @@ width: 100%; overflow-y: auto; } + +.event-text { + margin-left: 34px; +} + +.color-red { + color: red; +} + +.color-green { + color: green; +} + +.color-orange { + color: orange; +} + +.tab-top { + margin-top: 10px; +} + +.hidden-info { + display: none; +} diff --git a/src/portal/lib/src/operation/operation.component.html b/src/portal/lib/src/operation/operation.component.html index 1f3809cdd..0e6f70ce1 100644 --- a/src/portal/lib/src/operation/operation.component.html +++ b/src/portal/lib/src/operation/operation.component.html @@ -2,8 +2,8 @@ {{'OPERATION.EVENT_LOG' | translate}}
-

{{'OPERATION.LOCAL_EVENT' | translate}}

-
+

{{'OPERATION.LOCAL_EVENT' | translate}}

+
@@ -11,14 +11,14 @@
- - - + + +
{{list.data.name}}{{list.timeDiff | translate}} - + {{list.data.errorInf}}
@@ -29,13 +29,13 @@
- - + +
{{list.data.name}}{{list.timeDiff | translate}} - + {{list.data.errorInf}}
@@ -46,13 +46,13 @@
- - + +
{{list.data.name}}{{list.timeDiff | translate}} - + {{list.data.errorInf}}
diff --git a/src/portal/lib/src/operation/operation.component.ts b/src/portal/lib/src/operation/operation.component.ts index 5d2b78187..ad0593296 100644 --- a/src/portal/lib/src/operation/operation.component.ts +++ b/src/portal/lib/src/operation/operation.component.ts @@ -89,7 +89,7 @@ export class OperationComponent implements OnInit, OnDestroy { } toggleTitle(errorSpan: any) { - errorSpan.style.display = (errorSpan.style.display === 'none') ? 'block' : 'none'; + errorSpan.style.display = (errorSpan.style.display === 'block') ? 'none' : 'block'; } slideOut(): void { diff --git a/src/portal/lib/src/push-image/copy-input.coponent.html b/src/portal/lib/src/push-image/copy-input.coponent.html index 7778abc5c..974f8642b 100644 --- a/src/portal/lib/src/push-image/copy-input.coponent.html +++ b/src/portal/lib/src/push-image/copy-input.coponent.html @@ -7,7 +7,7 @@ - + diff --git a/src/portal/lib/src/push-image/push-image.component.html b/src/portal/lib/src/push-image/push-image.component.html index 18cbcc853..4b2aec25a 100644 --- a/src/portal/lib/src/push-image/push-image.component.html +++ b/src/portal/lib/src/push-image/push-image.component.html @@ -4,7 +4,7 @@ {{ 'PUSH_IMAGE.TITLE' | translate | uppercase}} - +
{{ 'PUSH_IMAGE.TITLE' | translate }}
 diff --git a/src/portal/lib/src/push-image/push-image.scss b/src/portal/lib/src/push-image/push-image.scss index 84444506c..d5707a3d3 100644 --- a/src/portal/lib/src/push-image/push-image.scss +++ b/src/portal/lib/src/push-image/push-image.scss @@ -44,4 +44,15 @@ } .hide{ display:none; +} + +.inputTarget { + width: 1px; + min-width: 0; + padding: 0; + opacity: .1; +} + +.dropdown-width { + min-width: 500px; } \ No newline at end of file diff --git a/src/portal/lib/src/replication/replication.component.html b/src/portal/lib/src/replication/replication.component.html index 9adc8623f..512d0b864 100644 --- a/src/portal/lib/src/replication/replication.component.html +++ b/src/portal/lib/src/replication/replication.component.html @@ -1,4 +1,4 @@ -
+
@@ -15,10 +15,10 @@ (selectOne)="selectOneRule($event)" (hideJobs)="hideJobs()" (openNewRule)="openModal()" (editOne)="openEditRule($event)" (reload)="reloadRules($event)" [loading]="loading" [withReplicationJob]="withReplicationJob" (redirect)="customRedirect($event)">
-
+
-
-
{{'REPLICATION.REPLICATION_JOBS' | translate}}
+
+
{{'REPLICATION.REPLICATION_JOBS' | translate}}
-
+
@@ -7,7 +7,7 @@ {{'CONFIG.REGISTRY_CERTIFICATE' | translate | uppercase}} - + @@ -51,7 +51,7 @@
-
{{'TAG.LABELS' | translate }}
-
+
diff --git a/src/portal/lib/src/tag/tag-detail.component.scss b/src/portal/lib/src/tag/tag-detail.component.scss index 9c72b2105..1afa55ce0 100644 --- a/src/portal/lib/src/tag/tag-detail.component.scss +++ b/src/portal/lib/src/tag/tag-detail.component.scss @@ -118,6 +118,10 @@ $size24:24px; font-size: 14px; } +.detail-tag { + margin-bottom: 2px; +} + .image-detail-label { margin-right: 10px; text-align: left; diff --git a/src/portal/lib/src/tag/tag.component.html b/src/portal/lib/src/tag/tag.component.html index 65ff89f6d..e1e7da2cc 100644 --- a/src/portal/lib/src/tag/tag.component.html +++ b/src/portal/lib/src/tag/tag.component.html @@ -22,7 +22,7 @@
-
+
@@ -36,8 +36,8 @@ ×
-
{{'LABEL.NO_LABELS' | translate }}
-
+
{{'LABEL.NO_LABELS' | translate }}
+
-
+
-
{{'LABEL.NO_LABELS' | translate }}
-
+
{{'LABEL.NO_LABELS' | translate }}
+
-
+
- {{'REPOSITORY.TAG' | translate}} - {{'REPOSITORY.SIZE' | translate}} - {{'REPOSITORY.PULL_COMMAND' | translate}} - {{'REPOSITORY.VULNERABILITY' | translate}} - {{'REPOSITORY.SIGNED' | translate}} - {{'REPOSITORY.AUTHOR' | translate}} - {{'REPOSITORY.CREATED' | translate}} - {{'REPOSITORY.DOCKER_VERSION' | translate}} - {{'REPOSITORY.LABELS' | translate}} + {{'REPOSITORY.TAG' | translate}} + {{'REPOSITORY.SIZE' | translate}} + {{'REPOSITORY.PULL_COMMAND' | translate}} + {{'REPOSITORY.VULNERABILITY' | translate}} + {{'REPOSITORY.SIGNED' | translate}} + {{'REPOSITORY.AUTHOR' | translate}} + {{'REPOSITORY.CREATED' | translate}} + {{'REPOSITORY.DOCKER_VERSION' | translate}} + {{'REPOSITORY.LABELS' | translate}} {{'TAG.PLACEHOLDER' | translate }} - + {{t.name}} {{t.name}} - {{sizeTransform(t.size)}} - + {{sizeTransform(t.size)}} + - + - - - + + + - + {{'REPOSITORY.NOTARY_IS_UNDETERMINED' | translate}} - {{t.author}} - {{t.created | date: 'short'}} - {{t.docker_version}} - + {{t.author}} + {{t.created | date: 'short'}} + {{t.docker_version}} +
diff --git a/src/portal/lib/src/tag/tag.component.scss b/src/portal/lib/src/tag/tag.component.scss index c0a0886dd..08d03be9a 100644 --- a/src/portal/lib/src/tag/tag.component.scss +++ b/src/portal/lib/src/tag/tag.component.scss @@ -149,6 +149,24 @@ min-width: 5rem; max-width: 15rem; border-radius: .125rem; + .form-group input { + position: relative; + margin-left: .5rem; + margin-right: .5rem; + } +} + +.no-labels { + padding-left: 10px; +} + +.has-label { + max-height: 300px; + overflow-y: auto; +} + +.filter-grid { + display: grid; } .labelBtn { @@ -186,12 +204,6 @@ color: #313131; } -.labelFilterPanel .form-group input { - position: relative; - margin-left: .5rem; - margin-right: .5rem; -} - .filterClose { position: absolute; right: 8px; @@ -208,4 +220,41 @@ hbr-image-name-input { width: 100%; +} + +.tag-row { + position: relative; +} + +.width-100 { + width: 100px; +} + +.width-130 { + width: 130px; +} + +.width-160 { + width: 160px; +} + +.flex-width { + min-width: 100px; + max-width: 220px; +} + +.flex-min-width { + min-width: 130px; +} + +.color-green { + color: #1D5100; +} + +.color-red { + color: #C92100; +} + +.color-gray { + color: #565656; } \ No newline at end of file diff --git a/src/portal/lib/src/vulnerability-scanning/result-bar-chart-component.html b/src/portal/lib/src/vulnerability-scanning/result-bar-chart-component.html index 9d47279b0..3096d211e 100644 --- a/src/portal/lib/src/vulnerability-scanning/result-bar-chart-component.html +++ b/src/portal/lib/src/vulnerability-scanning/result-bar-chart-component.html @@ -13,13 +13,13 @@
{{'VULNERABILITY.STATE.SCANNING' | translate}}
-
+
- {{'VULNERABILITY.STATE.UNKNOWN' | translate}} + {{'VULNERABILITY.STATE.UNKNOWN' | translate}}
\ No newline at end of file diff --git a/src/portal/lib/src/vulnerability-scanning/result-grid.component.html b/src/portal/lib/src/vulnerability-scanning/result-grid.component.html index 39ffd4b1d..70e0e1c9a 100644 --- a/src/portal/lib/src/vulnerability-scanning/result-grid.component.html +++ b/src/portal/lib/src/vulnerability-scanning/result-grid.component.html @@ -1,4 +1,4 @@ -
+
diff --git a/src/portal/lib/src/vulnerability-scanning/result-tip.componnent.html b/src/portal/lib/src/vulnerability-scanning/result-tip.componnent.html index dae714cc6..8021b306c 100644 --- a/src/portal/lib/src/vulnerability-scanning/result-tip.componnent.html +++ b/src/portal/lib/src/vulnerability-scanning/result-tip.componnent.html @@ -22,7 +22,7 @@ {{'VULNERABILITY.OVERALL_SEVERITY' | translate }} {{'VULNERABILITY.SEVERITY.LOW' | translate | titlecase }} - + {{'VULNERABILITY.OVERALL_SEVERITY' | translate }} {{'VULNERABILITY.SEVERITY.UNKNOWN' | translate | titlecase }} diff --git a/src/portal/lib/src/vulnerability-scanning/scanning.scss b/src/portal/lib/src/vulnerability-scanning/scanning.scss index cd5e6d5fd..8aa011d16 100644 --- a/src/portal/lib/src/vulnerability-scanning/scanning.scss +++ b/src/portal/lib/src/vulnerability-scanning/scanning.scss @@ -4,10 +4,16 @@ } .bar-state { text-align: center !important; + .unknow-text { + margin-left: -5px; + } } .bar-state-chart { margin-top: 2px; + .loop-height { + height: 2px; + } } .bar-state-error { @@ -130,4 +136,12 @@ hr{ z-index: 100; right: 35px; margin-top: 4px; +} + +.result-row { + position: relative; +} + +.help-icon { + margin-left: 3px; } \ No newline at end of file diff --git a/src/portal/src/app/account/account-settings/account-settings-modal.component.html b/src/portal/src/app/account/account-settings/account-settings-modal.component.html index 7031269a7..b4d4a6d92 100644 --- a/src/portal/src/app/account/account-settings/account-settings-modal.component.html +++ b/src/portal/src/app/account/account-settings/account-settings-modal.component.html @@ -1,7 +1,7 @@

{{'PROFILE.TITLE' | translate}}

-
+
@@ -55,7 +55,7 @@
- +
diff --git a/src/portal/src/app/account/account-settings/account-settings-modal.component.scss b/src/portal/src/app/account/account-settings/account-settings-modal.component.scss index ff10745a9..ee71c0347 100644 --- a/src/portal/src/app/account/account-settings/account-settings-modal.component.scss +++ b/src/portal/src/app/account/account-settings/account-settings-modal.component.scss @@ -8,7 +8,7 @@ clr-modal { padding-left: 3px; padding-right: 3px; } - position: relative; - bottom: 9px; + position: relative; + bottom: 9px; } } \ No newline at end of file diff --git a/src/portal/src/app/account/password-setting/forgot-password/forgot-password.component.html b/src/portal/src/app/account/password-setting/forgot-password/forgot-password.component.html index 5f50299e2..764b4ad21 100644 --- a/src/portal/src/app/account/password-setting/forgot-password/forgot-password.component.html +++ b/src/portal/src/app/account/password-setting/forgot-password/forgot-password.component.html @@ -2,7 +2,7 @@

{{'RESET_PWD.TITLE' | translate}}

-
+
@@ -24,7 +24,7 @@
- +
diff --git a/src/portal/src/app/account/password-setting/password-setting.component.html b/src/portal/src/app/account/password-setting/password-setting.component.html index 55e396ba5..c20d4222d 100644 --- a/src/portal/src/app/account/password-setting/password-setting.component.html +++ b/src/portal/src/app/account/password-setting/password-setting.component.html @@ -1,7 +1,7 @@

{{'CHANGE_PWD.TITLE' | translate}}

-
+
@@ -54,7 +54,7 @@
- +
diff --git a/src/portal/src/app/account/password-setting/password-setting.component.scss b/src/portal/src/app/account/password-setting/password-setting.component.scss index da42992cf..fb56152c2 100644 --- a/src/portal/src/app/account/password-setting/password-setting.component.scss +++ b/src/portal/src/app/account/password-setting/password-setting.component.scss @@ -4,4 +4,8 @@ .form-group-override { padding-left: 130px !important; +} + +.password-body { + min-height: 130px; } \ No newline at end of file diff --git a/src/portal/src/app/account/password-setting/reset-password/reset-password.component.html b/src/portal/src/app/account/password-setting/reset-password/reset-password.component.html index 49386ba17..db383076a 100644 --- a/src/portal/src/app/account/password-setting/reset-password/reset-password.component.html +++ b/src/portal/src/app/account/password-setting/reset-password/reset-password.component.html @@ -2,7 +2,7 @@

{{'RESET_PWD.TITLE' | translate}}

-
+
@@ -43,7 +43,7 @@
- +
diff --git a/src/portal/src/app/account/sign-up/sign-up-page.component.html b/src/portal/src/app/account/sign-up/sign-up-page.component.html index bf6ecd161..006cb0314 100644 --- a/src/portal/src/app/account/sign-up/sign-up-page.component.html +++ b/src/portal/src/app/account/sign-up/sign-up-page.component.html @@ -1,7 +1,7 @@

{{'SIGN_UP.TITLE' | translate}}

- +
\ No newline at end of file diff --git a/src/portal/src/app/account/sign-up/sign-up-page.component.ts b/src/portal/src/app/account/sign-up/sign-up-page.component.ts index 067c2cfe8..2ad27ae50 100644 --- a/src/portal/src/app/account/sign-up/sign-up-page.component.ts +++ b/src/portal/src/app/account/sign-up/sign-up-page.component.ts @@ -22,7 +22,8 @@ import { MessageService } from '../../global-message/message.service'; @Component({ selector: 'sign-up-page', - templateUrl: "sign-up-page.component.html" + templateUrl: "sign-up-page.component.html", + styleUrls: ['../../common.scss'] }) export class SignUpPageComponent implements OnInit { error: any; diff --git a/src/portal/src/app/account/sign-up/sign-up.component.html b/src/portal/src/app/account/sign-up/sign-up.component.html index c467fd45b..5a5562892 100644 --- a/src/portal/src/app/account/sign-up/sign-up.component.html +++ b/src/portal/src/app/account/sign-up/sign-up.component.html @@ -1,11 +1,11 @@

{{'SIGN_UP.TITLE' | translate}}

-
+
- +
diff --git a/src/portal/src/app/account/sign-up/sign-up.component.ts b/src/portal/src/app/account/sign-up/sign-up.component.ts index 31f450bc2..a0cc8a639 100644 --- a/src/portal/src/app/account/sign-up/sign-up.component.ts +++ b/src/portal/src/app/account/sign-up/sign-up.component.ts @@ -23,7 +23,8 @@ import { InlineAlertComponent } from '../../shared/inline-alert/inline-alert.com @Component({ selector: 'sign-up', - templateUrl: "sign-up.component.html" + templateUrl: "sign-up.component.html", + styleUrls: ['../../common.scss'] }) export class SignUpComponent { opened: boolean = false; diff --git a/src/portal/src/app/base/global-search/search-result.component.html b/src/portal/src/app/base/global-search/search-result.component.html index 80cdca6f9..9f03c23b1 100644 --- a/src/portal/src/app/base/global-search/search-result.component.html +++ b/src/portal/src/app/base/global-search/search-result.component.html @@ -1,5 +1,5 @@
-
+
< {{'SEARCH.BACK' | translate}}
diff --git a/src/portal/src/app/base/global-search/search.component.scss b/src/portal/src/app/base/global-search/search.component.scss index a4efecfb8..16b53fe26 100644 --- a/src/portal/src/app/base/global-search/search.component.scss +++ b/src/portal/src/app/base/global-search/search.component.scss @@ -69,4 +69,8 @@ #results { overflow-y: auto; max-height: 85%; +} + +#placeholder1 { + height: 24px; } \ No newline at end of file diff --git a/src/portal/src/app/base/navigator/navigator.component.html b/src/portal/src/app/base/navigator/navigator.component.html index fa881e91b..32deac54a 100644 --- a/src/portal/src/app/base/navigator/navigator.component.html +++ b/src/portal/src/app/base/navigator/navigator.component.html @@ -3,7 +3,7 @@ - + {{customProjectName?.projectName? customProjectName?.projectName:(appTitle | translate)}}
@@ -14,9 +14,9 @@
- @@ -29,7 +29,7 @@ diff --git a/src/portal/src/app/base/navigator/navigator.component.scss b/src/portal/src/app/base/navigator/navigator.component.scss index 7ca905221..3b3470f8d 100644 --- a/src/portal/src/app/base/navigator/navigator.component.scss +++ b/src/portal/src/app/base/navigator/navigator.component.scss @@ -38,4 +38,24 @@ .harbor-logo { width: 40px; margin-right: 15px; +} + +.nav-icon-width { + width: 98px !important; + .icon-left { + left: -8px; + } + .currentLang { + padding-right: 8px; + } +} + +.user-icon { + left: -2px; +} + +.headerLogo { + width: 36px; + height: 36px; + object-fit: fill; } \ No newline at end of file diff --git a/src/portal/src/app/common.scss b/src/portal/src/app/common.scss index ba425eec5..f460b669f 100644 --- a/src/portal/src/app/common.scss +++ b/src/portal/src/app/common.scss @@ -14,4 +14,12 @@ font-weight: 400; line-height: 12px; left: 170px; +} + +.body-format { + overflow-y: hidden; +} + +.loading-top { + top: 8px; } \ No newline at end of file diff --git a/src/portal/src/app/config/auth/config-auth.component.html b/src/portal/src/app/config/auth/config-auth.component.html index db411ec50..0d5987ea5 100644 --- a/src/portal/src/app/config/auth/config-auth.component.html +++ b/src/portal/src/app/config/auth/config-auth.component.html @@ -9,7 +9,7 @@
- + {{'CONFIG.TOOLTIP.AUTH_MODE' | translate}} @@ -56,7 +56,7 @@ {{'TOOLTIP.ITEM_REQUIRED' | translate}} - + {{'CONFIG.TOOLTIP.LDAP_SEARCH_DN' | translate}} @@ -81,7 +81,7 @@ {{'TOOLTIP.ITEM_REQUIRED' | translate}} - + {{'CONFIG.TOOLTIP.LDAP_BASE_DN' | translate}} @@ -106,7 +106,7 @@ {{'TOOLTIP.ITEM_REQUIRED' | translate}} - + {{'CONFIG.TOOLTIP.LDAP_UID' | translate}} @@ -120,7 +120,7 @@
- + {{'CONFIG.TOOLTIP.LDAP_SCOPE' | translate}} @@ -192,7 +192,7 @@
- + {{'CONFIG.TOOLTIP.SELF_REGISTRATION_ENABLE' | translate}} @@ -207,7 +207,7 @@ - + {{'CONFIG.TOOLTIP.VERIFY_CERT' | translate}} diff --git a/src/portal/src/app/config/auth/config-auth.component.scss b/src/portal/src/app/config/auth/config-auth.component.scss index fe2f29c51..c763962b3 100644 --- a/src/portal/src/app/config/auth/config-auth.component.scss +++ b/src/portal/src/app/config/auth/config-auth.component.scss @@ -4,4 +4,12 @@ clr-tooltip { .padding-right-28 { padding-right:28px; +} + +.top-1 { + top: -1px; +} + +.top-7 { + top: -7px; } \ No newline at end of file diff --git a/src/portal/src/app/config/config.component.html b/src/portal/src/app/config/config.component.html index de6680fec..fcf146b13 100644 --- a/src/portal/src/app/config/config.component.html +++ b/src/portal/src/app/config/config.component.html @@ -1,6 +1,6 @@
-

{{'CONFIG.TITLE' | translate }}

+

{{'CONFIG.TITLE' | translate }}