From b07d7d7229c376a0588d86ee8a28735bdcf99b7f Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Fri, 23 Nov 2018 11:36:36 +0300 Subject: [PATCH] reset buttons, better disabled for shadows --- src/App.scss | 5 ++ src/components/settings/settings.vue | 8 +-- .../shadow_control/shadow_control.vue | 9 +++- .../style_switcher/style_switcher.js | 4 ++ .../style_switcher/style_switcher.scss | 54 +++++++++++++++---- .../style_switcher/style_switcher.vue | 21 ++++++-- src/i18n/en.json | 5 +- src/services/style_setter/style_setter.js | 1 + 8 files changed, 85 insertions(+), 22 deletions(-) diff --git a/src/App.scss b/src/App.scss index 004c6fc3..ceb0bb87 100644 --- a/src/App.scss +++ b/src/App.scss @@ -120,6 +120,11 @@ input, textarea, .select { line-height: 16px; hyphens: none; + &:disabled, &[disabled=disabled] { + cursor: not-allowed; + opacity: 0.5; + } + .icon-down-open { position: absolute; top: 0; diff --git a/src/components/settings/settings.vue b/src/components/settings/settings.vue index 990d1f0d..2097fd22 100644 --- a/src/components/settings/settings.vue +++ b/src/components/settings/settings.vue @@ -208,12 +208,8 @@ .btn { min-height: 28px; - } - - .submit { - margin-top: 1em; - min-height: 30px; - width: 10em; + min-width: 10em; + padding: 0 2em; } } .select-multiple { diff --git a/src/components/shadow_control/shadow_control.vue b/src/components/shadow_control/shadow_control.vue index 2bc05cb7..b608d0ff 100644 --- a/src/components/shadow_control/shadow_control.vue +++ b/src/components/shadow_control/shadow_control.vue @@ -40,7 +40,7 @@
-
+
@@ -204,6 +216,7 @@
+
diff --git a/src/i18n/en.json b/src/i18n/en.json index 98a91013..15d57765 100644 --- a/src/i18n/en.json +++ b/src/i18n/en.json @@ -168,7 +168,10 @@ "keep_shadows": "Keep shadows", "keep_opacity": "Keep opacity", "keep_roundness": "Keep roundness", - "save_load_hint": "\"Keep\" options preserve currently set options when selecting or loading themes, it also stores said options when exporting a theme." + "save_load_hint": "\"Keep\" options preserve currently set options when selecting or loading themes, it also stores said options when exporting a theme.", + "reset": "Reset", + "clear_all": "Clear all", + "clear_opacity": "Clear opacity" }, "common": { "color": "Color", diff --git a/src/services/style_setter/style_setter.js b/src/services/style_setter/style_setter.js index 60531f28..680aadb4 100644 --- a/src/services/style_setter/style_setter.js +++ b/src/services/style_setter/style_setter.js @@ -249,6 +249,7 @@ const generateRadii = (input) => { }, { btn: 4, input: 4, + checkbox: 2, panel: 10, avatar: 5, avatarAlt: 50,