From 2064ef2ee1fa010b87cbf7eadb9bf4e481a2dc53 Mon Sep 17 00:00:00 2001 From: Tobias Klika Date: Thu, 10 Sep 2020 11:57:19 +0200 Subject: [PATCH] improve data passing for editor fields --- zero.Web.UI/App/components/forms/toggle.vue | 6 ++++++ zero.Web.UI/App/components/pickers/pick.vue | 8 +++++++- zero.Web.UI/App/editor/fields/text.vue | 2 +- zero.Web.UI/App/editor/fields/toggle.vue | 2 +- zero.Web.UI/Sass/Settings/_accent.scss | 5 +++++ 5 files changed, 20 insertions(+), 3 deletions(-) diff --git a/zero.Web.UI/App/components/forms/toggle.vue b/zero.Web.UI/App/components/forms/toggle.vue index fb76458f..bb5fb5b1 100644 --- a/zero.Web.UI/App/components/forms/toggle.vue +++ b/zero.Web.UI/App/components/forms/toggle.vue @@ -151,6 +151,12 @@ .ui-toggle.is-negative .ui-toggle-switch.is-active { background: var(--color-negative); + border-color: transparent !important; + + i + { + background: white; + } } .ui-toggle-off-warning diff --git a/zero.Web.UI/App/components/pickers/pick.vue b/zero.Web.UI/App/components/pickers/pick.vue index 5f6f986f..74bb169c 100644 --- a/zero.Web.UI/App/components/pickers/pick.vue +++ b/zero.Web.UI/App/components/pickers/pick.vue @@ -171,7 +171,7 @@ if (JSON.stringify(newval) !== JSON.stringify(oldval)) { this.buildConfig(); - this.loaded = false; + this.loaded = false; } } }, @@ -248,6 +248,12 @@ methods: { + refresh() + { + this.buildConfig(); + this.loaded = false; + }, + onValueChanged(val) { if (this.multiple) diff --git a/zero.Web.UI/App/editor/fields/text.vue b/zero.Web.UI/App/editor/fields/text.vue index 42746f4a..6f72f0be 100644 --- a/zero.Web.UI/App/editor/fields/text.vue +++ b/zero.Web.UI/App/editor/fields/text.vue @@ -1,6 +1,6 @@  diff --git a/zero.Web.UI/App/editor/fields/toggle.vue b/zero.Web.UI/App/editor/fields/toggle.vue index 8594314e..d9322a05 100644 --- a/zero.Web.UI/App/editor/fields/toggle.vue +++ b/zero.Web.UI/App/editor/fields/toggle.vue @@ -1,5 +1,5 @@  diff --git a/zero.Web.UI/Sass/Settings/_accent.scss b/zero.Web.UI/Sass/Settings/_accent.scss index 4fceb4e8..6655b9c7 100644 --- a/zero.Web.UI/Sass/Settings/_accent.scss +++ b/zero.Web.UI/Sass/Settings/_accent.scss @@ -68,4 +68,9 @@ $accent-colors: ( .color-primary { color: var(--color-primary); +} + +.color-negative +{ + color: var(--color-negative); } \ No newline at end of file