upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor synced 2024-09-21 05:25:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2132 from steven-zou/master

Browse Source 
Fix UX issues
This commit is contained in:
Steven Zou 2017-04-25 17:04:56 +08:00 committed by GitHub
commit cbe5a5bbd9
9 changed files with 41 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/ui_ng/src/app/account/sign-in/sign-in.component.css
View File

@ -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;
}

2
src/ui_ng/src/app/account/sign-in/sign-in.component.html
View File

@ -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">

5
src/ui_ng/src/app/base/global-search/global-search.component.ts
View File

@ -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";
}
}

2
src/ui_ng/src/app/base/global-search/search-result.component.ts
View File

@ -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]
})

11
src/ui_ng/src/app/base/global-search/search-result.component.css → src/ui_ng/src/app/base/global-search/search.component.css
View File

@ -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;
}

6
src/ui_ng/src/app/base/harbor-shell/harbor-shell.component.css
View File

@ -25,4 +25,8 @@
width: 100%;
z-index: 999;
padding-right: 276px;
}*/
}*/
.nav-link-override {
width: 126px !important;
}

12
src/ui_ng/src/app/base/harbor-shell/harbor-shell.component.html
View File

@ -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>

5
src/ui_ng/src/app/base/navigator/navigator.component.css
View File

@ -28,4 +28,9 @@
top: 10px;
opacity: 0.15;
content: '';
}
.nav-about-link {
padding-left: 12px !important;
padding-right: 12px !important;
}

3
src/ui_ng/src/app/base/navigator/navigator.component.html
View File

@ -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>