Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-11-22 18:25:56 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #5899 from pureshine/modify_space

Browse Source 
Make the space between the button and the tab section consistent
This commit is contained in:
Cheng Fangyuan 2018-09-18 17:44:47 +08:00 committed by GitHub
commit 407b46801b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/portal/lib/src/label/label.component.html
View File

@ -16,7 +16,7 @@
<button type="button" class="btn btn-sm btn-secondary" [disabled]="!selectedRow.length" (click)="deleteLabels(selectedRow)"><clr-icon shape="times" size="16"></clr-icon>&nbsp;{{'LABEL.DELETE' | translate}}</button> <button type="button" class="btn btn-sm btn-secondary" [disabled]="!selectedRow.length" (click)="deleteLabels(selectedRow)"><clr-icon shape="times" size="16"></clr-icon>&nbsp;{{'LABEL.DELETE' | translate}}</button>
<hbr-create-edit-label [scope]="scope" [projectId]="projectId" (reload)="reload()"></hbr-create-edit-label> <hbr-create-edit-label [scope]="scope" [projectId]="projectId" (reload)="reload()"></hbr-create-edit-label>
</div> </div>
<div class="col-lg-12 col-md-12 col-sm-12 col-xs-12"> <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12 content-mt">
<clr-datagrid [clrDgLoading]="loading" [(clrDgSelected)]="selectedRow" (clrDgSelectedChange)="selectedChange()"> <clr-datagrid [clrDgLoading]="loading" [(clrDgSelected)]="selectedRow" (clrDgSelectedChange)="selectedChange()">
<clr-dg-column [clrDgField]="'name'">{{'LABEL.LABEL' | translate}}</clr-dg-column> <clr-dg-column [clrDgField]="'name'">{{'LABEL.LABEL' | translate}}</clr-dg-column>
<clr-dg-column [clrDgField]="'endpoint'">{{'LABEL.DESCRIPTION' | translate}}</clr-dg-column> <clr-dg-column [clrDgField]="'endpoint'">{{'LABEL.DESCRIPTION' | translate}}</clr-dg-column>

3
src/portal/lib/src/label/label.component.scss
View File

@ -22,3 +22,6 @@
margin-top: 4px; margin-top: 4px;
height: 24px; height: 24px;
} }
.content-mt {
margin-top: -12px;
}

4
src/portal/src/app/project/member/member.component.html
View File

@ -1,4 +1,4 @@
<div class="row" style="margin-top: 4px;position: relative;"> <div class="row content-space">
<div> <div>
<div class="row flex-items-xs-between rightPos"> <div class="row flex-items-xs-between rightPos">
<div class="flex-xs-middle option-left" style="position: relative; top: 10px;"> <div class="flex-xs-middle option-left" style="position: relative; top: 10px;">
@ -31,7 +31,7 @@
</clr-dropdown-menu> </clr-dropdown-menu>
</clr-dropdown> </clr-dropdown>
</clr-dg-action-bar> </clr-dg-action-bar>
<clr-datagrid [(clrDgSelected)]="selectedRow" [clrDgLoading]="loading"> <clr-datagrid [(clrDgSelected)]="selectedRow" [clrDgLoading]="loading" class="datagrid-pt">
<clr-dg-column>{{'MEMBER.NAME' | translate}}</clr-dg-column> <clr-dg-column>{{'MEMBER.NAME' | translate}}</clr-dg-column>
<clr-dg-column>{{'MEMBER.MEMBER_TYPE'| translate}}</clr-dg-column> <clr-dg-column>{{'MEMBER.MEMBER_TYPE'| translate}}</clr-dg-column>
<clr-dg-column>{{'MEMBER.ROLE' | translate}}</clr-dg-column> <clr-dg-column>{{'MEMBER.ROLE' | translate}}</clr-dg-column>

7
src/portal/src/app/project/member/member.component.scss
View File

@ -33,5 +33,12 @@ clr-datagrid {
:host >>> clr-checkbox.checkbox.datagrid-foot-select { :host >>> clr-checkbox.checkbox.datagrid-foot-select {
position: inherit; position: inherit;
} }
.content-space {
margin-top: 12px;
position: relative;
}
.datagrid-pt {
padding-top: 0;
}

2
src/portal/src/app/project/project-label/project-label.component.html
View File

@ -1,5 +1,5 @@
<div class="row"> <div class="row">
<div class="col-lg-12 col-md-12 col-sm-12 col-xs-12" style="top: 8px;"> <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12 label-top">
<hbr-label [projectId]="projectId" [scope]="'p'" [hasProjectAdminRole]="hasProjectAdminRole"></hbr-label> <hbr-label [projectId]="projectId" [scope]="'p'" [hasProjectAdminRole]="hasProjectAdminRole"></hbr-label>
</div> </div>
</div> </div>

3
src/portal/src/app/project/project-label/project-label.component.scss
View File

@ -0,0 +1,3 @@
.label-top {
top: 12px;
}

2
src/portal/src/app/replication/replication-page.component.html
View File

@ -1,3 +1,3 @@
<div style="margin-top: 4px;"> <div>
<hbr-replication #replicationView [projectId]="projectIdentify" [projectName]="projectName" [isSystemAdmin]="isSystemAdmin" [withReplicationJob]='true' (goToRegistry)="goRegistry()"></hbr-replication> <hbr-replication #replicationView [projectId]="projectIdentify" [projectName]="projectName" [isSystemAdmin]="isSystemAdmin" [withReplicationJob]='true' (goToRegistry)="goRegistry()"></hbr-replication>
</div> </div>

2
src/portal/src/app/repository/repository-page.component.html
View File

@ -1,4 +1,4 @@
<div style="margin-top: 4px;"> <div>
<hbr-repository-gridview [projectId]="projectId" [projectName]="projectName" [hasSignedIn]="hasSignedIn" <hbr-repository-gridview [projectId]="projectId" [projectName]="projectName" [hasSignedIn]="hasSignedIn"
[hasProjectAdminRole]="hasProjectAdminRole" [mode]="mode" [hasProjectAdminRole]="hasProjectAdminRole" [mode]="mode"
(repoClickEvent)="watchRepoClickEvent($event)"></hbr-repository-gridview> (repoClickEvent)="watchRepoClickEvent($event)"></hbr-repository-gridview>