Merge pull request #13360 from AllForNothing/css-18

Fix css and i18n bugs

src/portal/src/app/project/repository/artifact-list-page/artifact-list/artifact-list-tab/artifact-list-tab.component.scss

@@ -220,10 +220,6 @@
   text-transform: none;
 }
 
-.labelBtn:hover {
-  background-color: #eee;
-}
-
 .labelBtn:focus {
   outline: none;
 }
@@ -410,10 +406,6 @@ clr-datagrid {
   padding: 0;
   li {
     padding-left: 1rem;
-    &:hover {
-      background-color: #eee;
-      
-    }
   }
 }
 .no-border:focus {

src/portal/src/css/common.scss

@@ -222,3 +222,24 @@ clr-header {
 .clr-page-size-select {
   z-index: 0!important;
 }
+hbr-copy-input {
+  .command-input {
+    color: $command-input-color;
+    background-color: $command-input-bg-color;
+  }
+}
+artifact-list-tab {
+  .labelBtn {
+     .pull-left {
+       color: $mode-font-color1
+     }
+  }
+  .labelBtn:hover {
+    background-color: $label-hover-bg-color;
+  }
+  .list-filter {
+    li:hover {
+      background-color: $label-hover-bg-color;
+    }
+  }
+}

src/portal/src/css/dark-theme.scss

@@ -35,5 +35,8 @@ $hbr-result-tip-histogram-inner-bg-color: #21333b;
 
 $harbor-icon-translate-x: 0;
 $harbor-icon-drop-shadow-x: 58px;
+$command-input-color: #eaedf0;
+$command-input-bg-color: #2e4757;
+$label-hover-bg-color: #28404d;
 
 @import "./common.scss";

src/portal/src/css/light-theme.scss

@@ -37,5 +37,7 @@ $hbr-result-tip-histogram-inner-bg-color: #fff;
 
 $harbor-icon-translate-x: 100%;
 $harbor-icon-drop-shadow-x: -56px;
-
+$command-input-color: none;
+$command-input-bg-color: none;
+$label-hover-bg-color: #eee;
 @import "./common.scss";

src/portal/src/i18n/lang/en-us-lang.json

@@ -1457,7 +1457,7 @@
         "ENABLE_ACTION": "Enable",
         "DISABLE_ACTION": "Disable",
         "DELETE_ACTION": "Delete",
-        "NOT_FOUND": "Not found",
+        "NOT_FOUND": "We couldn't find any instance!",
         "NAME": "Name",
         "ENDPOINT": "Endpoint",
         "STATUS": "Status",

src/portal/src/i18n/lang/es-es-lang.json

@@ -1455,7 +1455,7 @@
         "ENABLE_ACTION": "Enable",
         "DISABLE_ACTION": "Disable",
         "DELETE_ACTION": "Delete",
-        "NOT_FOUND": "Not found",
+        "NOT_FOUND": "We couldn't find any instance!",
         "NAME": "Name",
         "ENDPOINT": "Endpoint",
         "STATUS": "Status",

src/portal/src/i18n/lang/fr-fr-lang.json

@@ -1425,7 +1425,7 @@
         "ENABLE_ACTION": "Enable",
         "DISABLE_ACTION": "Disable",
         "DELETE_ACTION": "Delete",
-        "NOT_FOUND": "Not found",
+        "NOT_FOUND": "We couldn't find any instance!",
         "NAME": "Name",
         "ENDPOINT": "Endpoint",
         "STATUS": "Status",

src/portal/src/i18n/lang/pt-br-lang.json

@@ -1453,7 +1453,7 @@
         "ENABLE_ACTION": "Enable",
         "DISABLE_ACTION": "Disable",
         "DELETE_ACTION": "Delete",
-        "NOT_FOUND": "Not found",
+        "NOT_FOUND": "We couldn't find any instance!",
         "NAME": "Name",
         "ENDPOINT": "Endpoint",
         "STATUS": "Status",

src/portal/src/i18n/lang/tr-tr-lang.json

@@ -1457,7 +1457,7 @@
         "ENABLE_ACTION": "Enable",
         "DISABLE_ACTION": "Disable",
         "DELETE_ACTION": "Delete",
-        "NOT_FOUND": "Not found",
+        "NOT_FOUND": "We couldn't find any instance!",
         "NAME": "Name",
         "ENDPOINT": "Endpoint",
         "STATUS": "Status",

src/portal/src/i18n/lang/zh-cn-lang.json

@@ -1454,7 +1454,7 @@
         "ENABLE_ACTION": "启用",
         "DISABLE_ACTION": "禁用",
         "DELETE_ACTION": "删除",
-        "NOT_FOUND": "未发现任何记录",
+        "NOT_FOUND": "未发现任何实例",
         "NAME": "名称",
         "ENDPOINT": "端点",
         "STATUS": "状态",

src/portal/src/i18n/lang/zh-tw-lang.json

@@ -1441,7 +1441,7 @@
     "ENABLE_ACTION": "Enable",
     "DISABLE_ACTION": "Disable",
     "DELETE_ACTION": "Delete",
-    "NOT_FOUND": "Not found",
+    "NOT_FOUND": "We couldn't find any instance!",
     "NAME": "Name",
     "ENDPOINT": "Endpoint",
     "STATUS": "Status",

src/portal/src/lib/components/push-image/push-image.component.html

@@ -24,28 +24,28 @@
                 <section>
                     <h5 class="mt-0">{{ 'PUSH_IMAGE.DOCKER' | translate }} {{ 'PUSH_IMAGE.TITLE' | translate }}</h5>
                     <article class="commands-section">
-                        <hbr-copy-input #tagCopyImage (onCopyError)="onCpError($event)" inputSize="50" headerTitle="{{ 'PUSH_IMAGE.TAG_COMMAND' | translate }}" defaultValue="{{tagCommandImage}}"></hbr-copy-input>
+                        <hbr-copy-input #tagCopyImage (onCopyError)="onCpError($event)" inputSize="65" headerTitle="{{ 'PUSH_IMAGE.TAG_COMMAND' | translate }}" defaultValue="{{tagCommandImage}}"></hbr-copy-input>
                     </article>
                     <article class="commands-section">
-                        <hbr-copy-input #pushCopyImage (onCopyError)="onCpError($event)" inputSize="50" headerTitle="{{ 'PUSH_IMAGE.PUSH_COMMAND' | translate }}" defaultValue="{{pushCommandImage}}"></hbr-copy-input>
+                        <hbr-copy-input #pushCopyImage (onCopyError)="onCpError($event)" inputSize="65" headerTitle="{{ 'PUSH_IMAGE.PUSH_COMMAND' | translate }}" defaultValue="{{pushCommandImage}}"></hbr-copy-input>
                     </article>
                 </section>
                 <section>
                     <h5>{{ 'PUSH_IMAGE.HELM' | translate }} {{ 'PUSH_IMAGE.TITLE' | translate }}</h5>
                     <article class="commands-section">
-                        <hbr-copy-input #tagCopyChart (onCopyError)="onCpError($event)" inputSize="50" headerTitle="{{ 'PUSH_IMAGE.TAG_COMMAND_CHART' | translate }}" defaultValue="{{tagCommandChart}}"></hbr-copy-input>
+                        <hbr-copy-input #tagCopyChart (onCopyError)="onCpError($event)" inputSize="65" headerTitle="{{ 'PUSH_IMAGE.TAG_COMMAND_CHART' | translate }}" defaultValue="{{tagCommandChart}}"></hbr-copy-input>
                     </article>
                     <article class="commands-section">
-                        <hbr-copy-input #pushCopyChart (onCopyError)="onCpError($event)" inputSize="50" headerTitle="{{ 'PUSH_IMAGE.PUSH_COMMAND_CHART' | translate }}" defaultValue="{{pushCommandChart}}"></hbr-copy-input>
+                        <hbr-copy-input #pushCopyChart (onCopyError)="onCpError($event)" inputSize="65" headerTitle="{{ 'PUSH_IMAGE.PUSH_COMMAND_CHART' | translate }}" defaultValue="{{pushCommandChart}}"></hbr-copy-input>
                     </article>
                 </section>
                 <section>
                     <h5>{{ 'PUSH_IMAGE.CNAB' | translate }} {{ 'PUSH_IMAGE.TITLE' | translate }}</h5>
                     <article class="commands-section">
-                        <hbr-copy-input #pushCopyCnab (onCopyError)="onCpError($event)" inputSize="50" headerTitle="{{ 'PUSH_IMAGE.PUSH_COMMAND_CNAB' | translate }}" defaultValue="{{pushCommandCnab}}"></hbr-copy-input>
+                        <hbr-copy-input #pushCopyCnab (onCopyError)="onCpError($event)" inputSize="65" headerTitle="{{ 'PUSH_IMAGE.PUSH_COMMAND_CNAB' | translate }}" defaultValue="{{pushCommandCnab}}"></hbr-copy-input>
                     </article>
                 </section>
             </div>
         </clr-dropdown-menu>
     </clr-dropdown>
-</div>
+</div>

src/portal/src/lib/components/push-image/push-image.scss

@@ -54,5 +54,5 @@
 }
 
 .dropdown-width {
-    min-width: 500px;
+    min-width: 600px;
-}
+}