Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2024-11-07 09:31:31 +01:00
Code Issues Projects Releases Wiki Activity

only show folder edit if not no folder

Browse Source
This commit is contained in:
Kyle Spearrin 2018-01-31 21:04:04 -05:00
parent e64b19e3f4
commit e52b104a72
2 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/app/vault/groupings.component.html
View File

@ -45,7 +45,8 @@
<li *ngFor="let f of folders" [ngClass]="{active: selectedFolder && f.id === selectedFolderId}"> <li *ngFor="let f of folders" [ngClass]="{active: selectedFolder && f.id === selectedFolderId}">
<a href="#" appStopClick appBlurClick (click)="folder(f)"> <a href="#" appStopClick appBlurClick (click)="folder(f)">
<i class="fa-li fa fa-caret-right"></i> {{f.name}} <i class="fa-li fa fa-caret-right"></i> {{f.name}}
<span appStopProp appStopClick (click)="editFolder(f)" title="{{'editFolder' | i18n}}"> <span appStopProp appStopClick (click)="editFolder(f)" title="{{'editFolder' | i18n}}"
*ngIf="f.id">
<i class="fa fa-pencil fa-fw"></i> <i class="fa fa-pencil fa-fw"></i>
</span> </span>
</a> </a>

25
src/scss/vault.scss
View File

@ -4,6 +4,15 @@
height: 100%; height: 100%;
display: flex; display: flex;
#groupings, #items, #details {
display: flex;
flex-direction: column;
.inner-content {
padding: 10px 15px;
}
}
#groupings { #groupings {
background-color: $background-color-alt; background-color: $background-color-alt;
width: 15%; width: 15%;
@ -12,7 +21,8 @@
border-right: 1px solid $border-color-dark; border-right: 1px solid $border-color-dark;
.inner-content { .inner-content {
padding-bottom: 0 !important; padding-bottom: 0;
padding-right: 5px;
} }
h2 { h2 {
@ -92,9 +102,9 @@
&.active { &.active {
background-color: darken($background-color-alt, 5%); background-color: darken($background-color-alt, 5%);
margin-left: -15px; margin-left: -15px;
margin-right: -15px; margin-right: -5px;
padding-left: 15px; padding-left: 15px;
padding-right: 15px; padding-right: 5px;
} }
} }
} }
@ -151,15 +161,6 @@
} }
} }
#groupings, #items, #details {
display: flex;
flex-direction: column;
.inner-content {
padding: 10px 15px;
}
}
.header { .header {
min-height: 44px; min-height: 44px;
max-height: 44px; max-height: 44px;