diff --git a/static/images/icon-checkbox-green.svg b/static/images/icon-checkbox-green.svg new file mode 100644 index 0000000000..90e51093aa --- /dev/null +++ b/static/images/icon-checkbox-green.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/static/images/icon-checkbox-white.svg b/static/images/icon-checkbox-white.svg new file mode 100644 index 0000000000..0b1b4b4950 --- /dev/null +++ b/static/images/icon-checkbox-white.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/static/js/settings_ui.js b/static/js/settings_ui.js index ef01582896..8b2e50c252 100644 --- a/static/js/settings_ui.js +++ b/static/js/settings_ui.js @@ -4,9 +4,9 @@ var exports = {}; exports.display_checkmark = function ($elem) { var check_mark = document.createElement("img"); - check_mark.src = "/static/images/checkbox-green.svg"; + check_mark.src = "/static/images/icon-checkbox-green.svg"; $elem.prepend(check_mark); - $(check_mark).css("width", "13px"); + $(check_mark).css("width", "10px"); }; exports.strings = {}; diff --git a/static/styles/settings.css b/static/styles/settings.css index 0965a14294..43fee14be2 100644 --- a/static/styles/settings.css +++ b/static/styles/settings.css @@ -361,9 +361,9 @@ input[type=checkbox] + .inline-block { display: inline-block; cursor: pointer; font-size: 14px; - padding: 3px 12px 4px 10px; + padding: 3px 14px 4px 11px; text-decoration: none; - color: hsl(0, 0%, 43%); + color: hsl(0, 0%, 46%); font-weight: 400; } @@ -389,17 +389,21 @@ input[type=checkbox] + .inline-block { } #settings_page .icon-button .icon-button-icon { - color: #969696; + vertical-align: bottom; + margin-right: 3px; + font-size: 24px; + line-height: 19px; + font-weight: 600; } #settings_page .icon-button.primary .icon-button-icon { - color: white; + width: 10px; + margin-bottom: 2px; + margin-right: 3px; } -#settings_page .icon-button .icon-button-text, -#settings_page .icon-button .icon-button-icon { +#settings_page .icon-button .icon-button-text { vertical-align: baseline; - margin-right: 2px; } #settings_page .save-button-controls { @@ -426,6 +430,7 @@ input[type=checkbox] + .inline-block { #settings_page .save-button.saving .icon-button-loading { display: inline-block; + margin-right: 2px; } #settings_page .save-button .icon-button-loading { @@ -570,6 +575,7 @@ input[type=checkbox].inline-block { width: 13px; height: 20px; margin: 0; + margin-right: 3px; } #settings_page .alert-notification .loading_indicator_text { @@ -579,9 +585,9 @@ input[type=checkbox].inline-block { } #settings_page .alert-notification img { - margin-right: 5px; + margin-right: 6px; vertical-align: middle; - margin-top: -1px; + margin-top: -2px; } #notification-settings .notification-reminder { diff --git a/static/templates/settings/settings-save-discard-widget.handlebars b/static/templates/settings/settings-save-discard-widget.handlebars index 89861edeed..d7665d60ac 100644 --- a/static/templates/settings/settings-save-discard-widget.handlebars +++ b/static/templates/settings/settings-save-discard-widget.handlebars @@ -3,7 +3,7 @@
- + {{t 'Save changes' }} @@ -11,7 +11,7 @@
- + × {{t 'Discard' }}