From ec3c95d736d553315e0fe531ef7413a094c7e343 Mon Sep 17 00:00:00 2001 From: Vincent Salucci <26154748+vincentsalucci@users.noreply.github.com> Date: Thu, 27 Jan 2022 11:21:53 -0600 Subject: [PATCH] [Icons] Update Font Sheet (#1245) * [Icons] Update Font Sheet * Added import statement for styles * updated to clone icon * Changed save to save changes icon * Revert to using base bwi class * Updated import order for bwi icon styles * Converted new account switcher ui updates * Bump jslib * Fix occurances where bwi-eye-slash was used instead of btw-eye-slash-2 * Move settings cog to the left side * Updated eye/eye-slash icon references * Update jslib * Update jslib * Update fallback image for cipher icon * Update jslib Co-authored-by: Hinton --- jslib | 2 +- src/app/accounts/environment.component.html | 6 +-- src/app/accounts/hint.component.html | 2 +- src/app/accounts/lock.component.html | 8 ++-- src/app/accounts/login.component.html | 14 +++--- src/app/accounts/premium.component.html | 18 +++---- src/app/accounts/register.component.html | 10 ++-- .../accounts/remove-password.component.html | 4 +- src/app/accounts/set-password.component.html | 12 ++--- src/app/accounts/sso.component.html | 2 +- src/app/accounts/two-factor.component.html | 4 +- .../update-temp-password.component.html | 10 ++-- src/app/app.component.ts | 2 +- .../password-reprompt.component.html | 4 +- src/app/components/set-pin.component.html | 4 +- .../verify-master-password.component.html | 2 +- .../layout/account-switcher.component.html | 10 ++-- src/app/layout/nav.component.html | 2 +- src/app/layout/nav.component.ts | 4 +- src/app/layout/search/search.component.html | 2 +- src/app/send/add-edit.component.html | 18 +++---- src/app/send/send.component.html | 24 +++++----- .../add-edit-custom-fields.component.html | 10 ++-- src/app/vault/add-edit.component.html | 45 ++++++++++-------- src/app/vault/attachments.component.html | 12 +++-- src/app/vault/ciphers.component.html | 12 +++-- src/app/vault/collections.component.html | 8 +++- src/app/vault/export.component.html | 2 +- src/app/vault/folder-add-edit.component.html | 12 +++-- src/app/vault/groupings.component.html | 42 ++++++++-------- .../password-generator-history.component.html | 4 +- .../vault/password-generator.component.html | 10 ++-- src/app/vault/password-history.component.html | 2 +- src/app/vault/share.component.html | 8 +++- .../vault/view-custom-fields.component.html | 16 ++++--- src/app/vault/view.component.html | 42 ++++++++-------- src/images/bwi-globe.png | Bin 0 -> 500 bytes src/images/fa-globe.png | Bin 344 -> 0 bytes src/index.html | 2 +- src/scss/buttons.scss | 4 +- src/scss/header.scss | 2 +- src/scss/modal.scss | 2 +- src/scss/plugins.scss | 12 ++--- src/scss/styles.scss | 2 +- src/scss/vault.scss | 38 +++++++-------- 45 files changed, 242 insertions(+), 209 deletions(-) create mode 100644 src/images/bwi-globe.png delete mode 100644 src/images/fa-globe.png diff --git a/jslib b/jslib index 4722a287..6b4ed5fc 160000 --- a/jslib +++ b/jslib @@ -1 +1 @@ -Subproject commit 4722a287ec7212b8e67d02ec7ea1a9be0990ee6e +Subproject commit 6b4ed5fcce58c21a9977d94ebb65f954d6766548 diff --git a/src/app/accounts/environment.component.html b/src/app/accounts/environment.component.html index 87fde99d..319f6917 100644 --- a/src/app/accounts/environment.component.html +++ b/src/app/accounts/environment.component.html @@ -30,8 +30,8 @@ (click)="toggleCustom()" appA11yTitle="{{ 'toggleVisibility' | i18n }}" > - - + + {{ "customEnvironment" | i18n }} @@ -88,7 +88,7 @@
diff --git a/src/app/accounts/hint.component.html b/src/app/accounts/hint.component.html index 7f82d9e8..19ce6e77 100644 --- a/src/app/accounts/hint.component.html +++ b/src/app/accounts/hint.component.html @@ -23,7 +23,7 @@
{{ "cancel" | i18n }}
diff --git a/src/app/accounts/lock.component.html b/src/app/accounts/lock.component.html index 1879396d..eba102a4 100644 --- a/src/app/accounts/lock.component.html +++ b/src/app/accounts/lock.component.html @@ -1,6 +1,6 @@
- +

{{ "yourVaultIsLocked" | i18n }}

@@ -40,9 +40,9 @@ (click)="togglePassword()" >
@@ -66,7 +66,7 @@
@@ -74,17 +74,17 @@
- {{ "createAccount" | i18n }} + {{ "createAccount" | i18n }}
- {{ "enterpriseSingleSignOn" | i18n }} + {{ "enterpriseSingleSignOn" | i18n }}
diff --git a/src/app/accounts/premium.component.html b/src/app/accounts/premium.component.html index 4a4cb682..20859ec7 100644 --- a/src/app/accounts/premium.component.html +++ b/src/app/accounts/premium.component.html @@ -10,29 +10,29 @@

{{ "premiumNotCurrentMember" | i18n }}

{{ "premiumSignUpAndGet" | i18n }}

-
    +
    • - + {{ "premiumSignUpStorage" | i18n }}
    • - + {{ "premiumSignUpTwoStep" | i18n }}
    • - + {{ "premiumSignUpReports" | i18n }}
    • - + {{ "premiumSignUpTotp" | i18n }}
    • - + {{ "premiumSignUpSupport" | i18n }}
    • - + {{ "premiumSignUpFuture" | i18n }}
    @@ -74,12 +74,12 @@ [appApiAction]="refreshPromise" > diff --git a/src/app/accounts/register.component.html b/src/app/accounts/register.component.html index f4ee3dbd..8839af6b 100644 --- a/src/app/accounts/register.component.html +++ b/src/app/accounts/register.component.html @@ -50,9 +50,9 @@ (click)="togglePassword(false)" >
@@ -100,9 +100,9 @@ (click)="togglePassword(true)" > @@ -142,7 +142,7 @@
{{ "cancel" | i18n }}
diff --git a/src/app/accounts/remove-password.component.html b/src/app/accounts/remove-password.component.html index e62b512d..2442d3a4 100644 --- a/src/app/accounts/remove-password.component.html +++ b/src/app/accounts/remove-password.component.html @@ -11,7 +11,7 @@ (click)="convert()" > {{ "removeMasterPassword" | i18n }} - + diff --git a/src/app/accounts/set-password.component.html b/src/app/accounts/set-password.component.html index dc072815..a4d949fd 100644 --- a/src/app/accounts/set-password.component.html +++ b/src/app/accounts/set-password.component.html @@ -3,7 +3,7 @@ Bitwarden

{{ "setMasterPassword" | i18n }}

- + {{ "loading" | i18n }}
@@ -66,9 +66,9 @@ (click)="togglePassword(false)" >
@@ -118,9 +118,9 @@ (click)="togglePassword(true)" > @@ -143,7 +143,7 @@ {{ "cancel" | i18n }} diff --git a/src/app/accounts/update-temp-password.component.html b/src/app/accounts/update-temp-password.component.html index 4913019d..2fe336f4 100644 --- a/src/app/accounts/update-temp-password.component.html +++ b/src/app/accounts/update-temp-password.component.html @@ -46,9 +46,9 @@ (click)="togglePassword(false)" > @@ -93,9 +93,9 @@ (click)="togglePassword(true)" > @@ -116,7 +116,7 @@
{{ "logOut" | i18n }}
diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 93f2f90f..97b4fc32 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -66,7 +66,7 @@ const SyncInterval = 6 * 60 * 60 * 1000; // 6 hours
- +
diff --git a/src/app/components/password-reprompt.component.html b/src/app/components/password-reprompt.component.html index 66bef39f..6350c36a 100644 --- a/src/app/components/password-reprompt.component.html +++ b/src/app/components/password-reprompt.component.html @@ -29,9 +29,9 @@ (click)="togglePassword()" > diff --git a/src/app/components/set-pin.component.html b/src/app/components/set-pin.component.html index 00b46726..0b790d0c 100644 --- a/src/app/components/set-pin.component.html +++ b/src/app/components/set-pin.component.html @@ -31,9 +31,9 @@ (click)="toggleVisibility()" > diff --git a/src/app/components/verify-master-password.component.html b/src/app/components/verify-master-password.component.html index a2745663..2fd78bb9 100644 --- a/src/app/components/verify-master-password.component.html +++ b/src/app/components/verify-master-password.component.html @@ -25,7 +25,7 @@ {{ "sendCode" | i18n }} - + {{ "codeSent" | i18n }} diff --git a/src/app/layout/account-switcher.component.html b/src/app/layout/account-switcher.component.html index 1d50532f..aa65cd46 100644 --- a/src/app/layout/account-switcher.component.html +++ b/src/app/layout/account-switcher.component.html @@ -20,9 +20,9 @@ {{ "switchAccount" | i18n }} @@ -61,11 +61,11 @@ {{ a.value.profile.authenticationStatus }} @@ -74,7 +74,7 @@
- {{ "addAccount" | i18n }} + {{ "addAccount" | i18n }} diff --git a/src/app/layout/nav.component.html b/src/app/layout/nav.component.html index 345892e9..80350a07 100644 --- a/src/app/layout/nav.component.html +++ b/src/app/layout/nav.component.html @@ -1,5 +1,5 @@ - {{ item.label }} + {{ item.label }} diff --git a/src/app/layout/nav.component.ts b/src/app/layout/nav.component.ts index 737ecf12..89df06c3 100644 --- a/src/app/layout/nav.component.ts +++ b/src/app/layout/nav.component.ts @@ -9,12 +9,12 @@ export class NavComponent { items: any[] = [ { link: "/vault", - icon: "fa-lock", + icon: "bwi-lock-f", label: this.i18nService.translate("myVault"), }, { link: "/send", - icon: "fa-paper-plane", + icon: "bwi-send-f", label: "Send", }, ]; diff --git a/src/app/layout/search/search.component.html b/src/app/layout/search/search.component.html index 7a7a7315..515385c2 100644 --- a/src/app/layout/search/search.component.html +++ b/src/app/layout/search/search.component.html @@ -7,5 +7,5 @@ [formControl]="searchText" appAutofocus /> - + diff --git a/src/app/send/add-edit.component.html b/src/app/send/add-edit.component.html index c429109b..2a52320f 100644 --- a/src/app/send/add-edit.component.html +++ b/src/app/send/add-edit.component.html @@ -103,9 +103,9 @@ (click)="toggleOptions()" > @@ -168,9 +168,9 @@ [disabled]="disableSend" > @@ -260,8 +260,8 @@ [disabled]="form.loading" *ngIf="!disableSend" > - - + +