From ebda1cda2290f7daa783c49f19134221b36dc0b7 Mon Sep 17 00:00:00 2001
From: Yogi_Wang <wang1084@126.com>
Date: Fri, 18 Jan 2019 17:50:34 +0800
Subject: [PATCH] style_change

Signed-off-by: Yogi_Wang <wang1084@126.com>
---
 .../src/helm-chart/helm-chart.component.scss  |  1 +
 src/portal/lib/src/label/label.component.scss |  1 -
 .../list-replication-rule.component.html      |  4 +--
 .../replication/replication.component.scss    |  2 +-
 src/portal/lib/src/tag/tag.component.scss     |  3 +-
 .../src/app/log/audit-log.component.html      |  2 +-
 src/portal/src/app/log/audit-log.component.ts | 32 +++++++++++--------
 .../member/add-group/add-group.component.scss |  4 ++-
 8 files changed, 28 insertions(+), 21 deletions(-)

diff --git a/src/portal/lib/src/helm-chart/helm-chart.component.scss b/src/portal/lib/src/helm-chart/helm-chart.component.scss
index b03ebe643..cbbb50b7e 100644
--- a/src/portal/lib/src/helm-chart/helm-chart.component.scss
+++ b/src/portal/lib/src/helm-chart/helm-chart.component.scss
@@ -13,6 +13,7 @@ $size60:60px;
         overflow: hidden;
         .rightPos {
             @include grid-left-top-pos;
+            margin-top: 20px;
             .filter-divider {
                 display: inline-block;
                 height: 16px;
diff --git a/src/portal/lib/src/label/label.component.scss b/src/portal/lib/src/label/label.component.scss
index c798ac5c4..f1ec7bb47 100644
--- a/src/portal/lib/src/label/label.component.scss
+++ b/src/portal/lib/src/label/label.component.scss
@@ -7,7 +7,6 @@
       position: absolute;
       z-index: 100;
       right: 35px;
-      margin-top: 14px;
       height: 24px;
       .option-right {
         padding-right: 16px;
diff --git a/src/portal/lib/src/list-replication-rule/list-replication-rule.component.html b/src/portal/lib/src/list-replication-rule/list-replication-rule.component.html
index 479c5cc52..88d5a28cd 100644
--- a/src/portal/lib/src/list-replication-rule/list-replication-rule.component.html
+++ b/src/portal/lib/src/list-replication-rule/list-replication-rule.component.html
@@ -1,5 +1,5 @@
 <div  class="list-rule">
-<clr-datagrid [clrDgLoading]="loading"  [(clrDgSingleSelected)]="selectedRow" [clrDgRowSelection]="true">
+<clr-datagrid [clrDgLoading]="loading"  [(clrDgSingleSelected)]="selectedRow" (clrDgSingleSelectedChange)="selectRule($event)" [clrDgRowSelection]="true">
     <clr-dg-action-bar>
         <button type="button" class="btn btn-sm btn-secondary" *ngIf="isSystemAdmin" (click)="openModal()"><clr-icon shape="plus" size="16"></clr-icon>&nbsp;{{'REPLICATION.NEW_REPLICATION_RULE' | translate}}</button>
         <button type="button" class="btn btn-sm btn-secondary" *ngIf="isSystemAdmin" [disabled]="!selectedRow" (click)="editRule(selectedRow)"><clr-icon shape="pencil" size="16"></clr-icon>&nbsp;{{'REPLICATION.EDIT_POLICY' | translate}}</button>
@@ -13,7 +13,7 @@
     <clr-dg-column >{{'REPLICATION.DESTINATION_NAME' | translate}}</clr-dg-column>
     <clr-dg-column [clrDgField]="'trigger'">{{'REPLICATION.TRIGGER_MODE' | translate}}</clr-dg-column>
     <clr-dg-placeholder>{{'REPLICATION.PLACEHOLDER' | translate }}</clr-dg-placeholder>
-    <clr-dg-row *clrDgItems="let p of changedRules" [clrDgItem]="p"  (click)="selectRule(p)" [style.backgroundColor]="(projectScope && withReplicationJob && selectedId === p.id) ? '#eee' : ''">
+    <clr-dg-row *clrDgItems="let p of changedRules" [clrDgItem]="p" [style.backgroundColor]="(projectScope && withReplicationJob && selectedId === p.id) ? '#eee' : ''">
         <clr-dg-cell>{{p.name}}</clr-dg-cell>
         <clr-dg-cell>
             <div [ngSwitch]="hasDeletedLabel(p)">
diff --git a/src/portal/lib/src/replication/replication.component.scss b/src/portal/lib/src/replication/replication.component.scss
index c7664c936..16104b61f 100644
--- a/src/portal/lib/src/replication/replication.component.scss
+++ b/src/portal/lib/src/replication/replication.component.scss
@@ -16,7 +16,7 @@
  .rightPos{
     position: absolute;
     right: 35px;
-    margin-top: 15px;
+    margin-top: 20px;
     z-index: 100;
     height: 32px;
 }
diff --git a/src/portal/lib/src/tag/tag.component.scss b/src/portal/lib/src/tag/tag.component.scss
index b4e75260c..4234bfa1b 100644
--- a/src/portal/lib/src/tag/tag.component.scss
+++ b/src/portal/lib/src/tag/tag.component.scss
@@ -65,7 +65,8 @@
   position: relative;
   padding-left: .5rem;
   padding-right: .5rem;
-  line-height: 1.0
+  line-height: 1.0;
+  height: 1.2rem;
 }
 
 .dropdown-menu input {
diff --git a/src/portal/src/app/log/audit-log.component.html b/src/portal/src/app/log/audit-log.component.html
index b8cee16bc..f891de38f 100644
--- a/src/portal/src/app/log/audit-log.component.html
+++ b/src/portal/src/app/log/audit-log.component.html
@@ -30,7 +30,7 @@
         </div>
     </div>
     <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12 datagrid-margin-top ">
-        <clr-datagrid (clrDgRefresh)="retrieve($event)">
+        <clr-datagrid (clrDgRefresh)="retrievePage($event)">
             <clr-dg-column>{{'AUDIT_LOG.USERNAME' | translate}}</clr-dg-column>
             <clr-dg-column>{{'AUDIT_LOG.REPOSITORY_NAME' | translate}}</clr-dg-column>
             <clr-dg-column>{{'AUDIT_LOG.TAGS' | translate}}</clr-dg-column>
diff --git a/src/portal/src/app/log/audit-log.component.ts b/src/portal/src/app/log/audit-log.component.ts
index 17e567cb0..6b0817024 100644
--- a/src/portal/src/app/log/audit-log.component.ts
+++ b/src/portal/src/app/log/audit-log.component.ts
@@ -95,31 +95,35 @@ export class AuditLogComponent implements OnInit {
 
   }
 
-  retrieve(state?: State): void {
-    if (state) {
-      this.queryParam.page = Math.ceil((state.page.to + 1) / this.pageSize);
-      this.currentPage = this.queryParam.page;
-    }
+  private retrieve(): void {
     this.auditLogService
       .listAuditLogs(this.queryParam)
       .subscribe(
-      response => {
-        this.totalRecordCount = Number.parseInt(response.headers.get('x-total-count'));
-        this.auditLogs = response.json();
-      },
-      error => {
-        this.router.navigate(['/harbor', 'projects']);
-        this.messageHandlerService.handleError(error);
-      }
+        response => {
+          this.totalRecordCount = Number.parseInt(response.headers.get('x-total-count'));
+          this.auditLogs = response.json();
+        },
+        error => {
+          this.router.navigate(['/harbor', 'projects']);
+          this.messageHandlerService.handleError(error);
+        }
       );
   }
 
+  retrievePage(state: State) {
+    if (state && state.page) {
+      this.queryParam.page = Math.ceil((state.page.to + 1) / this.pageSize);
+      this.currentPage = this.queryParam.page;
+      this.retrieve();
+    }
+  }
+
   doSearchAuditLogs(searchUsername: string): void {
     this.queryParam.username = searchUsername;
     this.retrieve();
   }
 
-doSearchByStartTime(fromTimestamp: string): void {
+  doSearchByStartTime(fromTimestamp: string): void {
     this.queryParam.begin_timestamp = fromTimestamp;
     this.retrieve();
   }
diff --git a/src/portal/src/app/project/member/add-group/add-group.component.scss b/src/portal/src/app/project/member/add-group/add-group.component.scss
index 1d9d5d98b..575e651df 100644
--- a/src/portal/src/app/project/member/add-group/add-group.component.scss
+++ b/src/portal/src/app/project/member/add-group/add-group.component.scss
@@ -7,7 +7,9 @@ clr-datagrid {
 .row {
     margin-top: 12px;
 }
-
+.flex-items-xs-between{
+    display: flex;
+}
 .modeSelectradios {
     margin-top: 21px;
 }