From c8fc7ee6fc6d0588fd65e66074c89e3d4890ea8b Mon Sep 17 00:00:00 2001 From: "Patrick H. Lauke" Date: Tue, 2 Nov 2021 22:28:53 +0000 Subject: [PATCH 1/7] Add basic heading markup --- src/popup/accounts/environment.component.html | 12 +++++----- src/popup/accounts/hint.component.html | 4 ++-- src/popup/accounts/lock.component.html | 4 ++-- src/popup/accounts/login.component.html | 4 ++-- src/popup/accounts/register.component.html | 4 ++-- .../accounts/set-password.component.html | 4 ++-- .../two-factor-options.component.html | 4 ++-- src/popup/accounts/two-factor.component.html | 4 ++-- .../update-temp-password.component.html | 4 ++-- .../password-reprompt.component.html | 2 +- .../password-generator-history.component.html | 4 ++-- .../password-generator.component.html | 8 +++---- src/popup/send/send-add-edit.component.html | 12 +++++----- src/popup/send/send-groupings.component.html | 8 +++---- src/popup/send/send-type.component.html | 4 ++-- .../settings/excluded-domains.component.html | 4 ++-- src/popup/settings/export.component.html | 4 ++-- .../settings/folder-add-edit.component.html | 4 ++-- src/popup/settings/folders.component.html | 4 ++-- src/popup/settings/options.component.html | 16 ++++++------- src/popup/settings/premium.component.html | 4 ++-- src/popup/settings/settings.component.html | 12 +++++----- src/popup/settings/sync.component.html | 4 ++-- .../add-edit-custom-fields.component.html | 4 ++-- src/popup/vault/add-edit.component.html | 20 ++++++++-------- src/popup/vault/attachments.component.html | 8 +++---- src/popup/vault/ciphers.component.html | 12 +++++----- src/popup/vault/collections.component.html | 4 ++-- src/popup/vault/current-tab.component.html | 13 +++++----- src/popup/vault/groupings.component.html | 24 +++++++++---------- .../vault/password-history.component.html | 4 ++-- src/popup/vault/share.component.html | 8 +++---- .../vault/view-custom-fields.component.html | 4 ++-- src/popup/vault/view.component.html | 16 ++++++------- 34 files changed, 126 insertions(+), 125 deletions(-) diff --git a/src/popup/accounts/environment.component.html b/src/popup/accounts/environment.component.html index dbacca585a..26bf1192c3 100644 --- a/src/popup/accounts/environment.component.html +++ b/src/popup/accounts/environment.component.html @@ -3,9 +3,9 @@
{{'close' | i18n}}
-
+

{{'appName' | i18n}} -

+
diff --git a/src/popup/accounts/login.component.html b/src/popup/accounts/login.component.html index 6f0434b89f..1a2f7e1e56 100644 --- a/src/popup/accounts/login.component.html +++ b/src/popup/accounts/login.component.html @@ -3,9 +3,9 @@
{{'cancel' | i18n}}
-
+

{{'appName' | i18n}} -

+
-
+

{{'updateMasterPassword' | i18n}} -

+
-
+

{{'passwordHistory' | i18n}} -

+
-
+

{{'passGen' | i18n}} -

+
@@ -34,9 +34,9 @@
-
+

{{'options' | i18n}} -

+
diff --git a/src/popup/send/send-add-edit.component.html b/src/popup/send/send-add-edit.component.html index 10499559e8..af31e28c6e 100644 --- a/src/popup/send/send-add-edit.component.html +++ b/src/popup/send/send-add-edit.component.html @@ -3,9 +3,9 @@
-
+

{{title}} -

+
-
+

{{'share' | i18n}} -

+
@@ -110,11 +110,11 @@
-
+

{{'options' | i18n}} -

+
-
+

{{'types' | i18n}} -

+
-
+

{{'allSends' | i18n}}
{{sends.length}}
-

+
-
+

{{groupingTitle}} {{filteredSends.length}} -

+
{{'cancel' | i18n}}
-
+

{{'excludedDomains' | i18n}} -

+
diff --git a/src/popup/settings/export.component.html b/src/popup/settings/export.component.html index 922f3ebc15..381365423e 100644 --- a/src/popup/settings/export.component.html +++ b/src/popup/settings/export.component.html @@ -6,9 +6,9 @@ {{'back' | i18n}}
-
+

{{'exportVault' | i18n}} -

+
diff --git a/src/popup/settings/folder-add-edit.component.html b/src/popup/settings/folder-add-edit.component.html index 9ebdeb7ab3..23d61026d4 100644 --- a/src/popup/settings/folder-add-edit.component.html +++ b/src/popup/settings/folder-add-edit.component.html @@ -3,9 +3,9 @@
{{'cancel' | i18n}}
-
+

{{title}} -

+
-
+

{{'folders' | i18n}} -

+
-
+

{{'options' | i18n}} -

+
-
+

General -

+
@@ -84,11 +84,11 @@
-
+

Display -

+
@@ -141,11 +141,11 @@
-
+

Autofill -

+
diff --git a/src/popup/settings/premium.component.html b/src/popup/settings/premium.component.html index 3fbb32552e..478bd99405 100644 --- a/src/popup/settings/premium.component.html +++ b/src/popup/settings/premium.component.html @@ -5,9 +5,9 @@ {{'back' | i18n}}
-
+

{{'premiumMembership' | i18n}} -

+
diff --git a/src/popup/settings/settings.component.html b/src/popup/settings/settings.component.html index 66df2da28f..49f2cded39 100644 --- a/src/popup/settings/settings.component.html +++ b/src/popup/settings/settings.component.html @@ -2,14 +2,14 @@
-
+

{{'settings' | i18n}} -

+
-
{{'manage' | i18n}}
+

{{'manage' | i18n}}

{{'folders' | i18n}}
@@ -26,7 +26,7 @@
-
{{'security' | i18n}}
+

{{'security' | i18n}}

@@ -61,7 +61,7 @@
-
{{'account' | i18n}}
+

{{'account' | i18n}}

@@ -108,7 +108,7 @@
-
{{'other' | i18n}}
+

{{'other' | i18n}}

{{'options' | i18n}}
diff --git a/src/popup/settings/sync.component.html b/src/popup/settings/sync.component.html index 722a79f17a..2ec7c82548 100644 --- a/src/popup/settings/sync.component.html +++ b/src/popup/settings/sync.component.html @@ -5,9 +5,9 @@ {{'back' | i18n}}
-
+

{{'sync' | i18n}} -

+
diff --git a/src/popup/vault/add-edit-custom-fields.component.html b/src/popup/vault/add-edit-custom-fields.component.html index 4fe2eae422..68bfb5ca41 100644 --- a/src/popup/vault/add-edit-custom-fields.component.html +++ b/src/popup/vault/add-edit-custom-fields.component.html @@ -1,7 +1,7 @@
-
+

{{'customFields' | i18n}} -

+
diff --git a/src/popup/vault/add-edit.component.html b/src/popup/vault/add-edit.component.html index 76f571d15e..9e2eb8f3ea 100644 --- a/src/popup/vault/add-edit.component.html +++ b/src/popup/vault/add-edit.component.html @@ -3,9 +3,9 @@
-
+

{{title}} -

+
-
+

{{'attachments' | i18n}} -

+
-
+

{{'newAttachment' | i18n}} -

+
diff --git a/src/popup/vault/ciphers.component.html b/src/popup/vault/ciphers.component.html index 90f7c08832..fc19b7b54b 100644 --- a/src/popup/vault/ciphers.component.html +++ b/src/popup/vault/ciphers.component.html @@ -20,9 +20,9 @@
-
+

{{'folders' | i18n}} -

+
-
+

{{'collections' | i18n}} -

+
-
+

{{'collections' | i18n}} -

+
-
+

{{'typeLogins' | i18n}} {{loginCiphers.length}} -

+
-
+

{{'cards' | i18n}} {{cardCiphers.length}} -

+
-
+

{{'identities' | i18n}} {{identityCiphers.length}} -

+
diff --git a/src/popup/vault/groupings.component.html b/src/popup/vault/groupings.component.html index 32cefbe75b..0cce4dfcac 100644 --- a/src/popup/vault/groupings.component.html +++ b/src/popup/vault/groupings.component.html @@ -24,10 +24,10 @@
-
+

{{'favorites' | i18n}} {{favoriteCiphers.length}} -

+
-
+

{{'types' | i18n}} 4 -

+
-
+

{{'folders' | i18n}} {{folderCount}} -

+
-
+

{{'collections' | i18n}} {{nestedCollections.length}} -

+
-
+

{{'noneFolder' | i18n}}
{{noFolderCiphers.length}}
-

+
-
+

{{'trash' | i18n}} {{deletedCount}} -

+
-
+

{{'passwordHistory' | i18n}} -

+
diff --git a/src/popup/vault/share.component.html b/src/popup/vault/share.component.html index f6422ae634..a16dd91bc3 100644 --- a/src/popup/vault/share.component.html +++ b/src/popup/vault/share.component.html @@ -3,9 +3,9 @@
-
+

{{'moveToOrganization' | i18n}} -

+
-
+

{{'collections' | i18n}} -

+
{{'noCollectionsInList' | i18n}} diff --git a/src/popup/vault/view-custom-fields.component.html b/src/popup/vault/view-custom-fields.component.html index 8c3c1853b4..851cd8e19c 100644 --- a/src/popup/vault/view-custom-fields.component.html +++ b/src/popup/vault/view-custom-fields.component.html @@ -1,7 +1,7 @@ -
+

{{'customFields' | i18n}} -

+
diff --git a/src/popup/vault/view.component.html b/src/popup/vault/view.component.html index 9603f8af4a..bf77ca7e9c 100644 --- a/src/popup/vault/view.component.html +++ b/src/popup/vault/view.component.html @@ -2,18 +2,18 @@
-
+

{{'viewItem' | i18n}} -

+
-
+

{{'itemInformation' | i18n}} -

+
{{'name' | i18n}} @@ -211,9 +211,9 @@
-
+

{{'notes' | i18n}} -

+
@@ -225,9 +225,9 @@ [copy]="copy.bind(this)">
-
+

{{'attachments' | i18n}} -

+
-
{{'tools' | i18n}}
+

{{'tools' | i18n}}

{{'premiumMembership' | i18n}} - +

From b5f2474b68f875fbf54258f5f0bbd48a9f984734 Mon Sep 17 00:00:00 2001 From: "Patrick H. Lauke" Date: Mon, 13 Dec 2021 19:53:01 +0000 Subject: [PATCH 4/7] Neutralise/reset heading styles - make size/weight match regular text - remove the theming, as it will inherit this anyway from its surroundings/container; having the color explicitly defined here creates issues as it's more specific otherwise and overrides the local context --- src/popup/scss/base.scss | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/popup/scss/base.scss b/src/popup/scss/base.scss index 17f1b28c7e..42abe64c09 100644 --- a/src/popup/scss/base.scss +++ b/src/popup/scss/base.scss @@ -43,10 +43,8 @@ body { h1, h2, h3, h4, h5, h6 { font-family: $font-family-sans-serif; - - @include themify($themes) { - color: themed('textColor'); - } + font-size: $font-size-base; + font-weight: normal; } p { From 75878442f074ce629891512f1e5a3d3b2d96b5e7 Mon Sep 17 00:00:00 2001 From: "Patrick H. Lauke" Date: Mon, 13 Dec 2021 20:16:43 +0000 Subject: [PATCH 5/7] Missing class --- src/popup/settings/settings.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/popup/settings/settings.component.html b/src/popup/settings/settings.component.html index 9aa8cf7177..1ca91e9ef7 100644 --- a/src/popup/settings/settings.component.html +++ b/src/popup/settings/settings.component.html @@ -61,7 +61,7 @@
-

{{'account' | i18n}}

+

{{'account' | i18n}}

From ba37c05d1bee21a7a0e825f6b0ad3926eb8bb9d3 Mon Sep 17 00:00:00 2001 From: "Patrick H. Lauke" Date: Mon, 13 Dec 2021 20:56:23 +0000 Subject: [PATCH 6/7] Add visually hidden

to views that lack an overarching heading --- src/popup/send/send-groupings.component.html | 1 + src/popup/send/send-type.component.html | 1 + src/popup/vault/ciphers.component.html | 1 + src/popup/vault/groupings.component.html | 1 + 4 files changed, 4 insertions(+) diff --git a/src/popup/send/send-groupings.component.html b/src/popup/send/send-groupings.component.html index 6947021b70..9b9c7d4131 100644 --- a/src/popup/send/send-groupings.component.html +++ b/src/popup/send/send-groupings.component.html @@ -2,6 +2,7 @@
+

{{'send' | i18n}}

diff --git a/src/popup/send/send-type.component.html b/src/popup/send/send-type.component.html index f4747e4934..e25f7f1b64 100644 --- a/src/popup/send/send-type.component.html +++ b/src/popup/send/send-type.component.html @@ -5,6 +5,7 @@ {{'back' | i18n}}
+

{{'send' | i18n}}

diff --git a/src/popup/vault/ciphers.component.html b/src/popup/vault/ciphers.component.html index fc19b7b54b..d59462c09a 100644 --- a/src/popup/vault/ciphers.component.html +++ b/src/popup/vault/ciphers.component.html @@ -5,6 +5,7 @@ {{'back' | i18n}}
+

{{'myVault' | i18n}}

+

{{'myVault' | i18n}}

From 086f062a6cb9368b9b4d90856bb77009670395fb Mon Sep 17 00:00:00 2001 From: "Patrick H. Lauke" Date: Thu, 16 Dec 2021 20:09:05 +0000 Subject: [PATCH 7/7] Update jslib --- jslib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jslib b/jslib index 24fe836032..8fc3cf50d2 160000 --- a/jslib +++ b/jslib @@ -1 +1 @@ -Subproject commit 24fe836032354d4ec39435776e54dd0995e1b389 +Subproject commit 8fc3cf50d2967212ffbbf0d57cac71d0774aa2a8