From e4033c85e2066d8a575a1cd8e5a59bb685a3adf0 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Mon, 20 Jan 2020 00:34:49 +0200
Subject: removed console logs

---
 src/components/shadow_control/shadow_control.vue | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/components/shadow_control/shadow_control.vue')

diff --git a/src/components/shadow_control/shadow_control.vue b/src/components/shadow_control/shadow_control.vue
index de8a42d1..efbb980e 100644
--- a/src/components/shadow_control/shadow_control.vue
+++ b/src/components/shadow_control/shadow_control.vue
@@ -191,6 +191,8 @@
         v-model="selected.color"
         :disabled="!present"
         :label="$t('settings.style.common.color')"
+        :fallback="currentFallback.color"
+        :showOptionalTickbox="false"
         name="shadow"
       />
       <OpacityInput
-- 
cgit v1.2.3-70-g09d2


From a7b6c79136012353397203f937d2baa667d08895 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Mon, 20 Jan 2020 01:45:48 +0200
Subject: eslint

---
 src/components/shadow_control/shadow_control.vue | 2 +-
 src/components/style_switcher/style_switcher.js  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/components/shadow_control/shadow_control.vue')

diff --git a/src/components/shadow_control/shadow_control.vue b/src/components/shadow_control/shadow_control.vue
index efbb980e..c1db5b8f 100644
--- a/src/components/shadow_control/shadow_control.vue
+++ b/src/components/shadow_control/shadow_control.vue
@@ -192,7 +192,7 @@
         :disabled="!present"
         :label="$t('settings.style.common.color')"
         :fallback="currentFallback.color"
-        :showOptionalTickbox="false"
+        :show-optional-tickbox="false"
         name="shadow"
       />
       <OpacityInput
diff --git a/src/components/style_switcher/style_switcher.js b/src/components/style_switcher/style_switcher.js
index 2a1e439b..799646b1 100644
--- a/src/components/style_switcher/style_switcher.js
+++ b/src/components/style_switcher/style_switcher.js
@@ -202,8 +202,8 @@ export default {
             ...acc,
             ...textColors.reduce((acc, textColorKey) => {
               const newKey = slotIsBaseText
-                    ? 'bg' + textColorKey[0].toUpperCase() + textColorKey.slice(1)
-                    : textColorKey
+                ? 'bg' + textColorKey[0].toUpperCase() + textColorKey.slice(1)
+                : textColorKey
               return {
                 ...acc,
                 [newKey]: getContrastRatioLayers(
-- 
cgit v1.2.3-70-g09d2


From 93dfb4d3524df14f730a3f0ad46ebb86ceb89984 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Mon, 20 Jan 2020 02:00:13 +0200
Subject: fix shadow picker preview, change hint

---
 src/components/shadow_control/shadow_control.js  | 2 +-
 src/components/shadow_control/shadow_control.vue | 9 ++++++---
 src/i18n/en.json                                 | 2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)

(limited to 'src/components/shadow_control/shadow_control.vue')

diff --git a/src/components/shadow_control/shadow_control.js b/src/components/shadow_control/shadow_control.js
index 653d5a9b..bdfb4429 100644
--- a/src/components/shadow_control/shadow_control.js
+++ b/src/components/shadow_control/shadow_control.js
@@ -95,7 +95,7 @@ export default {
     },
     style () {
       return this.ready ? {
-        boxShadow: getCssShadow(this.cValue)
+        boxShadow: getCssShadow(this.fallback)
       } : {}
     }
   }
diff --git a/src/components/shadow_control/shadow_control.vue b/src/components/shadow_control/shadow_control.vue
index c1db5b8f..815a9e59 100644
--- a/src/components/shadow_control/shadow_control.vue
+++ b/src/components/shadow_control/shadow_control.vue
@@ -199,9 +199,12 @@
         v-model="selected.alpha"
         :disabled="!present"
       />
-      <p>
-        {{ $t('settings.style.shadows.hint') }}
-      </p>
+      <i18n
+        path="settings.style.shadows.hintV3"
+        tag="p"
+      >
+        <code>--variable,mod</code>
+      </i18n>
     </div>
   </div>
 </template>
diff --git a/src/i18n/en.json b/src/i18n/en.json
index f7a26262..f624a1c5 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -452,7 +452,7 @@
         "blur": "Blur",
         "spread": "Spread",
         "inset": "Inset",
-        "hint": "For shadows you can also use --variable as a color value to use CSS3 variables. Please note that setting opacity won't work in this case.",
+        "hintV3": "For shadows you can also use the {0} notation to use other color slot.",
         "filter_hint": {
           "always_drop_shadow": "Warning, this shadow always uses {0} when browser supports it.",
           "drop_shadow_syntax": "{0} does not support {1} parameter and {2} keyword.",
-- 
cgit v1.2.3-70-g09d2

