bitwarden/web
1
0
Fork 0
mirror of https://github.com/bitwarden/web synced 2026-02-04 02:33:31 +00:00
Code Issues Releases Wiki Activity

Fix merge errors

Browse Source
This commit is contained in:
Thomas Rittson
2021-10-21 14:51:24 +10:00
parent d10afbc130
commit 53e18abe4f
1 changed files with 1 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/app/vault/vault.component.html
View File

@@ -8,7 +8,7 @@
(onTrashClicked)="filterDeleted()">
</app-vault-groupings>
</div>
<div class="col-6">
<div class="col-12 col-md-8 col-lg-9 mt-4 mt-md-0">
<div class="page-header d-flex">
<h1>
{{'myVault' | i18n}}
@@ -98,35 +98,6 @@
</div>
</div>
</div>
<div class="col-12 col-md-8 col-lg-9 mt-4 mt-md-0">
<div class="page-header d-flex">
<h1>
{{'myVault' | i18n}}
<small #actionSpinner [appApiAction]="ciphersComponent.actionPromise">
<ng-container *ngIf="actionSpinner.loading">
<i class="fa fa-spinner fa-spin text-muted" title="{{'loading' | i18n}}"
aria-hidden="true"></i>
<span class="sr-only">{{'loading' | i18n}}</span>
</ng-container>
</small>
</h1>
<div class="ml-auto d-flex">
<app-vault-bulk-actions [ciphersComponent]="ciphersComponent" [modal]="modal" [deleted]="deleted">
</app-vault-bulk-actions>
<button type="button" class="btn btn-primary btn-sm" (click)="addCipher()" *ngIf="!deleted">
<i class="fa fa-plus fa-fw" aria-hidden="true"></i>{{'addItem' | i18n}}
</button>
</div>
</div>
<app-callout type="warning" *ngIf="deleted" icon="fa-warning">
{{trashCleanupWarning}}
</app-callout>
<app-vault-ciphers (onCipherClicked)="editCipher($event)"
(onAttachmentsClicked)="editCipherAttachments($event)" (onAddCipher)="addCipher()"
(onShareClicked)="shareCipher($event)" (onCollectionsClicked)="editCipherCollections($event)"
(onCloneClicked)="cloneCipher($event)">
</app-vault-ciphers>
</div>
</div>
</div>
<ng-template #attachments></ng-template>