Fix css issue for chart label filter (#15891)

Signed-off-by: AllForNothing <[email protected]>
goharbor · Oct 29, 2021 · fed8406 · fed8406
1 parent ec1c8c9
commit fed8406
Show file tree

Hide file tree

Showing 10 changed files with 25 additions and 11 deletions.
diff --git a/...rc/app/base/project/helm-chart/helm-chart-detail/label-filter/label-filter.component.html b/...rc/app/base/project/helm-chart/helm-chart-detail/label-filter/label-filter.component.html
@@ -1,6 +1,6 @@
 <div>
     <div class="form-group filter-div">
-        <input #filterInput type="text" placeholder='{{"LABEL.FILTER_LABEL_PLACEHOLDER" | translate }}'
+        <input #filterInput class="clr-input" type="text" placeholder='{{"LABEL.FILTER_LABEL_PLACEHOLDER" | translate }}'
             [(ngModel)]="labelFilter">
     </div>
     <div class="label-items-container">
@@ -18,4 +18,4 @@
             </div>
         </div>
     </div>
-</div>
+</div>
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
@@ -15,12 +15,7 @@
     margin-bottom: 24px;
 }
 
-.info-tips-icon {
-    color: grey;
-}
-
 .info-tips-icon:hover {
-    color: #007CBB;
     cursor: pointer;
 }
 

diff --git a/src/portal/src/app/shared/components/view-token/view-token.component.html b/src/portal/src/app/shared/components/view-token/view-token.component.html
@@ -94,7 +94,7 @@ <h3 class="modal-title">
             <div class="form-group robot-token">
                 <label class="form-group-label-override">{{'ROBOT_ACCOUNT.TOKEN' |
                     translate}}</label>
-                <hbr-copy-input (onCopySuccess)="onCpSuccess($event)"
+                <hbr-copy-input #copyInputComponent (onCopySuccess)="onCpSuccess($event)"
                                 inputSize="50" headerTitle=""
                                 defaultValue="{{robot?.secret}}" class="copy-input"></hbr-copy-input>
             </div>

diff --git a/src/portal/src/app/shared/components/view-token/view-token.component.ts b/src/portal/src/app/shared/components/view-token/view-token.component.ts
@@ -11,6 +11,7 @@ import { DomSanitizer, SafeUrl } from "@angular/platform-browser";
 import { TranslateService } from "@ngx-translate/core";
 import { InlineAlertComponent } from "../inline-alert/inline-alert.component";
 import { errorHandler } from "../../units/shared.utils";
+import { CopyInputComponent } from "../push-image/copy-input.component";
 
 @Component({
   selector: 'view-token',
@@ -28,6 +29,8 @@ export class ViewTokenComponent implements OnInit {
   @ViewChild(InlineAlertComponent)
   inlineAlertComponent: InlineAlertComponent;
   @ViewChild('secretForm', { static: true }) secretForm: NgForm;
+  @ViewChild('copyInputComponent')
+  copyInputComponent: CopyInputComponent;
   @Output()
   refreshSuccess: EventEmitter<boolean> = new EventEmitter<boolean>();
   copyToken: boolean = false;
@@ -111,6 +114,9 @@ export class ViewTokenComponent implements OnInit {
   onCpSuccess($event: any): void {
     this.copyToken = false;
     this.tokenModalOpened = false;
+    if (this.copyInputComponent) {
+      this.copyInputComponent.reset();
+    }
     this.translate
         .get("ROBOT_ACCOUNT.COPY_SUCCESS", { param: this.robot.name })
         .subscribe((res: string) => {

diff --git a/src/portal/src/css/common.scss b/src/portal/src/css/common.scss
@@ -281,3 +281,12 @@ input:-webkit-autofill {
   -webkit-text-fill-color: $input-autofill-color !important;
   caret-color: $input-autofill-color
 }
+
+hbr-copy-input {
+  .info-tips-icon {
+    color: $pull-command-icon-color;
+  }
+  .info-tips-icon:hover {
+    color: $pull-command-icon-hover-color;
+  }
+}
diff --git a/src/portal/src/css/dark-theme.scss b/src/portal/src/css/dark-theme.scss
@@ -45,4 +45,6 @@ $back-link-color: #4aaed9!important;
 $radio-button-checked: #4aaed9;
 $input-autofill-bg-color: #1b2a32;
 $input-autofill-color: #eaedf0;
+$pull-command-icon-color: #4aaed9;
+$pull-command-icon-hover-color: #007CBB;
 @import "./common.scss";
diff --git a/src/portal/src/css/light-theme.scss b/src/portal/src/css/light-theme.scss
@@ -47,4 +47,6 @@ $back-link-color: none;
 $radio-button-checked: #0072a3;
 $input-autofill-bg-color: #fafafa;
 $input-autofill-color: #000;
+$pull-command-icon-color: #007CBB;
+$pull-command-icon-hover-color: #4aaed9;
 @import "./common.scss";
diff --git a/src/portal/src/i18n/lang/en-us-lang.json b/src/portal/src/i18n/lang/en-us-lang.json
@@ -342,7 +342,7 @@
     "ROBOT_ACCOUNT": {
         "NAME": "Name",
         "PERMISSIONS": "Permissions",
-        "TOKEN": "Token",
+        "TOKEN": "Secret",
         "NEW_ROBOT_ACCOUNT": "NEW ROBOT ACCOUNT",
         "ENABLED_STATE": "Enabled state",
         "NUMBER_REQUIRED": "Field is required and should be an integer other than 0.",

diff --git a/src/portal/src/i18n/lang/es-es-lang.json b/src/portal/src/i18n/lang/es-es-lang.json
@@ -343,7 +343,7 @@
     "ROBOT_ACCOUNT": {
         "NAME": "Name",
         "PERMISSIONS": "Permissions",
-        "TOKEN": "Token",
+        "TOKEN": "Secret",
         "NEW_ROBOT_ACCOUNT": "NEW ROBOT ACCOUNT",
         "ENABLED_STATE": "Enabled state",
         "CREATETION": "Created time",

diff --git a/src/portal/src/i18n/lang/zh-cn-lang.json b/src/portal/src/i18n/lang/zh-cn-lang.json
@@ -1702,6 +1702,6 @@
         "STOP": "停止",
         "LIST": "查询",
         "REPOSITORY": "仓库",
-        "HELM_LABEL": "Helm Chart label"
+        "HELM_LABEL": "Helm Chart 标签"
     }
 }