From 65a3f8f92559f4a796656b4f43212db34eff1e2d Mon Sep 17 00:00:00 2001 From: Albiona Date: Mon, 25 Mar 2019 15:08:48 +0100 Subject: [PATCH 1/3] refactor(settings): add style to buttons instead of links style(buttons): use buttons instead of links style(buttons): use buttons in recovery_key file refactor(style): remove unnecessary style refactor(style): remove unnecessary style refactor(style): remove unnecessary style refactor(style): remove unnecessary style refactor(style): remove unnecessary style refactor(style): remove unnecessary style refactor(style): remove unnecessary style refactor(style): remove unnecessary style refactor(style): remove unnecessary style refactor(style): remove unnecessary style refactor(style): remove unnecessary style --- .../account_recovery/recovery_key.mustache | 12 ++++++------ .../templates/settings/recovery_codes.mustache | 16 ++++++++-------- app/styles/modules/_settings-totp.scss | 9 +++++++++ 3 files changed, 23 insertions(+), 14 deletions(-) diff --git a/app/scripts/templates/settings/account_recovery/recovery_key.mustache b/app/scripts/templates/settings/account_recovery/recovery_key.mustache index 681e128a12..3a9a7d0dd6 100644 --- a/app/scripts/templates/settings/account_recovery/recovery_key.mustache +++ b/app/scripts/templates/settings/account_recovery/recovery_key.mustache @@ -13,18 +13,18 @@ {{^isIos}}
- + + +
{{/isIos}} diff --git a/app/scripts/templates/settings/recovery_codes.mustache b/app/scripts/templates/settings/recovery_codes.mustache index 610946966e..eba84fdec3 100644 --- a/app/scripts/templates/settings/recovery_codes.mustache +++ b/app/scripts/templates/settings/recovery_codes.mustache @@ -36,27 +36,27 @@ {{^isIos}}
- + + +
{{/isIos}} {{#isIos}}
- +
{{/isIos}} {{/showRecoveryCodes}} diff --git a/app/styles/modules/_settings-totp.scss b/app/styles/modules/_settings-totp.scss index 8dcdc221e3..f0ca29ea5b 100644 --- a/app/styles/modules/_settings-totp.scss +++ b/app/styles/modules/_settings-totp.scss @@ -138,6 +138,15 @@ margin-top: 25px; } +.save-option-button { + background: none !important; + border: 0; + box-shadow: none !important; + margin-bottom: 25px; + outline: none; + display: block; +} + .save-option { width: 33%; From f5912543030100ce57e3c2797670670f7e5f7908 Mon Sep 17 00:00:00 2001 From: Albiona Date: Mon, 25 Mar 2019 16:54:38 +0100 Subject: [PATCH 2/3] refactor(settings): add button style instead of links --- app/styles/modules/_settings-totp.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/styles/modules/_settings-totp.scss b/app/styles/modules/_settings-totp.scss index f0ca29ea5b..9cb9b3f985 100644 --- a/app/styles/modules/_settings-totp.scss +++ b/app/styles/modules/_settings-totp.scss @@ -142,9 +142,9 @@ background: none !important; border: 0; box-shadow: none !important; + display: block; margin-bottom: 25px; outline: none; - display: block; } .save-option { From 6e0ea9b197aedb83602678fd709a8ccb855e2068 Mon Sep 17 00:00:00 2001 From: Albiona Date: Wed, 3 Apr 2019 01:10:52 +0200 Subject: [PATCH 3/3] refactor(settings): add style for buttons instead of links refactor(settings): order properties refactor(settings): order properties refactor(settings): order properties refactor(settings): order properties --- .../account_recovery/recovery_key.mustache | 4 ++-- .../templates/settings/avatar_change.mustache | 4 ++-- .../templates/settings/recovery_codes.mustache | 2 +- app/styles/modules/_avatar.scss | 2 +- app/styles/modules/_button-row.scss | 14 ++++++++++++++ app/styles/modules/_settings-totp.scss | 9 --------- 6 files changed, 20 insertions(+), 15 deletions(-) diff --git a/app/scripts/templates/settings/account_recovery/recovery_key.mustache b/app/scripts/templates/settings/account_recovery/recovery_key.mustache index 3a9a7d0dd6..4442cbd6ca 100644 --- a/app/scripts/templates/settings/account_recovery/recovery_key.mustache +++ b/app/scripts/templates/settings/account_recovery/recovery_key.mustache @@ -30,10 +30,10 @@ {{#isIos}}
- +
{{/isIos}} diff --git a/app/scripts/templates/settings/avatar_change.mustache b/app/scripts/templates/settings/avatar_change.mustache index 238c290185..4b8cf30d0a 100644 --- a/app/scripts/templates/settings/avatar_change.mustache +++ b/app/scripts/templates/settings/avatar_change.mustache @@ -12,10 +12,10 @@ diff --git a/app/scripts/templates/settings/recovery_codes.mustache b/app/scripts/templates/settings/recovery_codes.mustache index eba84fdec3..a92414538f 100644 --- a/app/scripts/templates/settings/recovery_codes.mustache +++ b/app/scripts/templates/settings/recovery_codes.mustache @@ -53,7 +53,7 @@ {{#isIos}}
- diff --git a/app/styles/modules/_avatar.scss b/app/styles/modules/_avatar.scss index 442c727c4a..4e631b8611 100644 --- a/app/styles/modules/_avatar.scss +++ b/app/styles/modules/_avatar.scss @@ -221,7 +221,7 @@ margin: 0 -40px -20px -40px; padding: 25px 20px 20px; - a { + button, a { background: { repeat: no-repeat; size: 48%; diff --git a/app/styles/modules/_button-row.scss b/app/styles/modules/_button-row.scss index ae2ac20a2c..2cfcc2d38e 100644 --- a/app/styles/modules/_button-row.scss +++ b/app/styles/modules/_button-row.scss @@ -83,6 +83,20 @@ button { } } +.save-option-button { + background: none; + background-color: transparent; + color: $link-color-default; + display: inline-block; + height: 80px; + padding: 10px; + width: 0; +} + +.save-option-button:hover { + background-color: transparent; +} + button::-moz-focus-inner { border: 0; padding: 0; diff --git a/app/styles/modules/_settings-totp.scss b/app/styles/modules/_settings-totp.scss index 9cb9b3f985..8dcdc221e3 100644 --- a/app/styles/modules/_settings-totp.scss +++ b/app/styles/modules/_settings-totp.scss @@ -138,15 +138,6 @@ margin-top: 25px; } -.save-option-button { - background: none !important; - border: 0; - box-shadow: none !important; - display: block; - margin-bottom: 25px; - outline: none; -} - .save-option { width: 33%;