From ba18333405879ccbb47ba7aa3ac78fbed09048dc Mon Sep 17 00:00:00 2001
From: Steven Zou <szou@vmware.com>
Date: Tue, 25 Apr 2017 15:27:19 +0800
Subject: [PATCH 1/2] fix issue:#2011

---
 .../src/app/account/sign-in/sign-in.component.css     |  8 +++++++-
 .../src/app/account/sign-in/sign-in.component.html    |  2 +-
 .../app/base/global-search/global-search.component.ts |  5 +++--
 .../app/base/global-search/search-result.component.ts |  2 +-
 ...arch-result.component.css => search.component.css} | 11 +++++++++++
 .../src/app/base/navigator/navigator.component.css    |  5 +++++
 .../src/app/base/navigator/navigator.component.html   |  3 ++-
 7 files changed, 30 insertions(+), 6 deletions(-)
 rename src/ui_ng/src/app/base/global-search/{search-result.component.css => search.component.css} (83%)

diff --git a/src/ui_ng/src/app/account/sign-in/sign-in.component.css b/src/ui_ng/src/app/account/sign-in/sign-in.component.css
index b8dbc9ab8..dbc820b4a 100644
--- a/src/ui_ng/src/app/account/sign-in/sign-in.component.css
+++ b/src/ui_ng/src/app/account/sign-in/sign-in.component.css
@@ -33,7 +33,7 @@
 
 .repo-container {
     width: 100%;
-    margin-top: -250px;
+    margin-top: -210px;
 }
 
 .more-info-link {
@@ -41,4 +41,10 @@
     top: 80px;
     left: 294px;
     padding-right: 36px;
+}
+
+.tm-font {
+    font-size: 14px !important;
+    position: relative;
+    top: -9px;
 }
\ No newline at end of file
diff --git a/src/ui_ng/src/app/account/sign-in/sign-in.component.html b/src/ui_ng/src/app/account/sign-in/sign-in.component.html
index ae4415aa4..2000863d5 100644
--- a/src/ui_ng/src/app/account/sign-in/sign-in.component.html
+++ b/src/ui_ng/src/app/account/sign-in/sign-in.component.html
@@ -1,6 +1,6 @@
 <div class="login-wrapper login-wrapper-override">
     <form #signInForm="ngForm" class="login">
-        <label class="title">{{appTitle | translate}}<span class="trademark">&#8482;</span>
+        <label class="title">{{appTitle | translate}}<span class="trademark tm-font">&#8482;</span>
     </label>
         <div class="login-group">
             <label for="username" aria-haspopup="true" role="tooltip" class="tooltip tooltip-validation tooltip-md tooltip-top-left">
diff --git a/src/ui_ng/src/app/base/global-search/global-search.component.ts b/src/ui_ng/src/app/base/global-search/global-search.component.ts
index 942ca9b85..ad3c810a3 100644
--- a/src/ui_ng/src/app/base/global-search/global-search.component.ts
+++ b/src/ui_ng/src/app/base/global-search/global-search.component.ts
@@ -28,7 +28,8 @@ const deBounceTime = 500; //ms
 
 @Component({
     selector: 'global-search',
-    templateUrl: "global-search.component.html"
+    templateUrl: "global-search.component.html",
+    styleUrls: ["search.component.css"]
 })
 export class GlobalSearchComponent implements OnInit, OnDestroy {
     //Keep search term as Subject
@@ -62,7 +63,7 @@ export class GlobalSearchComponent implements OnInit, OnDestroy {
             this.searchTerm = "";
         });
 
-        if(this.appConfigService.isIntegrationMode()){
+        if (this.appConfigService.isIntegrationMode()) {
             this.placeholderText = "GLOBAL_SEARCH.PLACEHOLDER_VIC";
         }
     }
diff --git a/src/ui_ng/src/app/base/global-search/search-result.component.ts b/src/ui_ng/src/app/base/global-search/search-result.component.ts
index 2dc80c4c4..6ca1d97e3 100644
--- a/src/ui_ng/src/app/base/global-search/search-result.component.ts
+++ b/src/ui_ng/src/app/base/global-search/search-result.component.ts
@@ -24,7 +24,7 @@ import { MessageHandlerService } from '../../shared/message-handler/message-hand
 @Component({
     selector: "search-result",
     templateUrl: "search-result.component.html",
-    styleUrls: ["search-result.component.css"],
+    styleUrls: ["search.component.css"],
 
     providers: [GlobalSearchService]
 })
diff --git a/src/ui_ng/src/app/base/global-search/search-result.component.css b/src/ui_ng/src/app/base/global-search/search.component.css
similarity index 83%
rename from src/ui_ng/src/app/base/global-search/search-result.component.css
rename to src/ui_ng/src/app/base/global-search/search.component.css
index b92d46761..d5c858f79 100644
--- a/src/ui_ng/src/app/base/global-search/search-result.component.css
+++ b/src/ui_ng/src/app/base/global-search/search.component.css
@@ -53,4 +53,15 @@
 
 .search-header a:hover {
     text-decoration: none;
+}
+
+.search::after {
+    position: absolute;
+    content: '';
+    display: inline-block;
+    background: #fafafa;
+    opacity: .15;
+    height: 40px;
+    width: 1px;
+    top: 10px;
 }
\ No newline at end of file
diff --git a/src/ui_ng/src/app/base/navigator/navigator.component.css b/src/ui_ng/src/app/base/navigator/navigator.component.css
index 3b658d839..f0aa81937 100644
--- a/src/ui_ng/src/app/base/navigator/navigator.component.css
+++ b/src/ui_ng/src/app/base/navigator/navigator.component.css
@@ -28,4 +28,9 @@
     top: 10px;
     opacity: 0.15;
     content: '';
+}
+
+.nav-about-link {
+    padding-left: 12px !important;
+    padding-right: 12px !important;
 }
\ No newline at end of file
diff --git a/src/ui_ng/src/app/base/navigator/navigator.component.html b/src/ui_ng/src/app/base/navigator/navigator.component.html
index 1931b2f01..17815800b 100644
--- a/src/ui_ng/src/app/base/navigator/navigator.component.html
+++ b/src/ui_ng/src/app/base/navigator/navigator.component.html
@@ -38,6 +38,7 @@
                 <a href="javascript:void(0)" clrDropdownItem (click)="logOut()">{{'ACCOUNT_SETTINGS.LOGOUT' | translate}}</a>
             </div>
         </clr-dropdown>
-        <a href="javascript:void(0)" class="nav-link nav-text" (click)="openAboutDialog()" *ngIf="isSessionValid === false">{{'ACCOUNT_SETTINGS.ABOUT' | translate}}</a>
+        <div class="nav-divider" *ngIf="!isSessionValid"></div>
+        <a href="javascript:void(0)" id="aboutMenu" class="nav-link nav-text nav-about-link" (click)="openAboutDialog()" *ngIf="!isSessionValid">{{'ACCOUNT_SETTINGS.ABOUT' | translate}}</a>
     </div>
 </clr-header>
\ No newline at end of file

From 95c4994737e6172321abeb23f289a3fd5e9f8a5e Mon Sep 17 00:00:00 2001
From: Steven Zou <szou@vmware.com>
Date: Tue, 25 Apr 2017 16:28:45 +0800
Subject: [PATCH 2/2] fix issue:#2012

---
 .../app/base/harbor-shell/harbor-shell.component.css |  6 +++++-
 .../base/harbor-shell/harbor-shell.component.html    | 12 ++++++------
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/ui_ng/src/app/base/harbor-shell/harbor-shell.component.css b/src/ui_ng/src/app/base/harbor-shell/harbor-shell.component.css
index bdd94c9b1..25cff95af 100644
--- a/src/ui_ng/src/app/base/harbor-shell/harbor-shell.component.css
+++ b/src/ui_ng/src/app/base/harbor-shell/harbor-shell.component.css
@@ -25,4 +25,8 @@
     width: 100%;
     z-index: 999;
     padding-right: 276px;
-}*/
\ No newline at end of file
+}*/
+
+.nav-link-override {
+    width: 126px !important;
+}
\ No newline at end of file
diff --git a/src/ui_ng/src/app/base/harbor-shell/harbor-shell.component.html b/src/ui_ng/src/app/base/harbor-shell/harbor-shell.component.html
index 2ae65c2be..0f3e41774 100644
--- a/src/ui_ng/src/app/base/harbor-shell/harbor-shell.component.html
+++ b/src/ui_ng/src/app/base/harbor-shell/harbor-shell.component.html
@@ -11,16 +11,16 @@
             <router-outlet></router-outlet>
         </div>
         <nav class="sidenav" style="padding: 12px 36px;" *ngIf="isUserExisting">
-            <section class="sidenav-content">
-                <a routerLink="/harbor/projects" routerLinkActive="active" class="nav-link">{{'SIDE_NAV.PROJECTS' | translate}}</a>
-                <a routerLink="/harbor/logs" routerLinkActive="active" class="nav-link" style="margin-top: 4px;">{{'SIDE_NAV.LOGS' | translate}}</a>
+            <section class="sidenav-content" style="padding-top: 20px;">
+                <a routerLink="/harbor/projects" routerLinkActive="active" class="nav-link nav-link-override">{{'SIDE_NAV.PROJECTS' | translate}}</a>
+                <a routerLink="/harbor/logs" routerLinkActive="active" class="nav-link nav-link-override" style="margin-top: 4px;">{{'SIDE_NAV.LOGS' | translate}}</a>
                 <section class="nav-group collapsible" *ngIf="isSystemAdmin" style="margin-top: 4px;">
                     <input id="tabsystem" type="checkbox">
                     <label for="tabsystem">{{'SIDE_NAV.SYSTEM_MGMT.NAME' | translate}}</label>
                     <ul class="nav-list">
-                        <li><a class="nav-link" routerLink="/harbor/users" routerLinkActive="active">{{'SIDE_NAV.SYSTEM_MGMT.USER' | translate}}</a></li>
-                        <li><a class="nav-link" routerLink="/harbor/replications/endpoints" routerLinkActive="active">{{'SIDE_NAV.SYSTEM_MGMT.REPLICATION' | translate}}</a></li>
-                        <li><a class="nav-link" routerLink="/harbor/configs" routerLinkActive="active">{{'SIDE_NAV.SYSTEM_MGMT.CONFIG' | translate}}</a></li>
+                        <li><a class="nav-link nav-link-override" routerLink="/harbor/users" routerLinkActive="active">{{'SIDE_NAV.SYSTEM_MGMT.USER' | translate}}</a></li>
+                        <li><a class="nav-link nav-link-override" routerLink="/harbor/replications/endpoints" routerLinkActive="active">{{'SIDE_NAV.SYSTEM_MGMT.REPLICATION' | translate}}</a></li>
+                        <li><a class="nav-link nav-link-override" routerLink="/harbor/configs" routerLinkActive="active">{{'SIDE_NAV.SYSTEM_MGMT.CONFIG' | translate}}</a></li>
                     </ul>
                 </section>
             </section>