From 0fb66e247affdbafff334989c3025d02c5fbe0d5 Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Wed, 6 Jun 2018 23:00:57 -0400 Subject: [PATCH] search and move dropdown button --- src/app/vault/ciphers.component.html | 36 ++++++++++++-------------- src/app/vault/groupings.component.html | 3 ++- src/app/vault/groupings.component.ts | 13 +++++++++- src/app/vault/vault.component.html | 3 ++- src/app/vault/vault.component.ts | 4 +++ src/scss/styles.scss | 23 +++++++++------- 6 files changed, 51 insertions(+), 31 deletions(-) diff --git a/src/app/vault/ciphers.component.html b/src/app/vault/ciphers.component.html index 734ebaf183..dd49be7a88 100644 --- a/src/app/vault/ciphers.component.html +++ b/src/app/vault/ciphers.component.html @@ -2,19 +2,6 @@ - @@ -22,12 +9,23 @@ + diff --git a/src/app/vault/groupings.component.html b/src/app/vault/groupings.component.html index 5fbc44ff9a..6300cbe611 100644 --- a/src/app/vault/groupings.component.html +++ b/src/app/vault/groupings.component.html @@ -3,7 +3,8 @@ Filters
- +
diff --git a/src/app/vault/vault.component.ts b/src/app/vault/vault.component.ts index 1c488fb3e2..4af132f398 100644 --- a/src/app/vault/vault.component.ts +++ b/src/app/vault/vault.component.ts @@ -128,6 +128,10 @@ export class VaultComponent implements OnInit { this.go(); } + filterSearchText(searchText: string) { + this.ciphersComponent.searchText = searchText; + } + editCipherAttachments(cipher: CipherView) { if (this.modal != null) { this.modal.close(); diff --git a/src/scss/styles.scss b/src/scss/styles.scss index 3450fc7804..a5f958c76b 100644 --- a/src/scss/styles.scss +++ b/src/scss/styles.scss @@ -92,29 +92,25 @@ app-vault { } tr:hover { - td:first-child { - background-color: $body-bg; + td:last-child .dropdown button { + visibility: initial; } } td { vertical-align: middle; - a { + small { display: block; + color: $text-muted; } } td:first-child { - width: 65px; - border: none; - } - - td:nth-child(2) { width: 25px; } - td:nth-child(3) { + td:nth-child(2) { width: 25px; text-align: center; @@ -123,5 +119,14 @@ app-vault { @extend .img-fluid; } } + + td:last-child { + width: 65px; + text-align: right; + + .dropdown:not(.show) button { + visibility: hidden; + } + } } }
- - - - {{c.name}} - - - - {{c.subTitle}} + {{c.name}} + + + {{c.subTitle}} + +