From c195786ffc5f547da6ee29246434cea5205381b5 Mon Sep 17 00:00:00 2001 From: Jiiks Date: Tue, 23 Jan 2018 09:23:15 +0200 Subject: [PATCH] add some generics and styling + new spinners --- .../ui/vue/components/bd/CssEditor.vue | 4 +- .../components/bd/templates/CssEditor.html | 19 +- .../ui/vue/components/generic/Button.vue | 0 .../ui/vue/components/generic/FormButton.vue | 11 + .../vue/components/generic/ScrollerWrap.vue | 12 +- .../vue/components/generic/SettingSwitch.vue | 13 +- .../ui/vue/components/generic/index.js | 3 +- .../generic/templates/ScrollerWrap.html | 3 - .../generic/templates/SettingSwitch.html | 10 - client/src/styles/partials/animations.scss | 327 ------ client/src/styles/partials/generic.scss | 29 +- client/src/styles/partials/index.scss | 1 + client/src/styles/partials/spinners.scss | 942 ++++++++++++++++++ 13 files changed, 1012 insertions(+), 362 deletions(-) create mode 100644 client/src/modules/ui/vue/components/generic/Button.vue create mode 100644 client/src/modules/ui/vue/components/generic/FormButton.vue delete mode 100644 client/src/modules/ui/vue/components/generic/templates/ScrollerWrap.html delete mode 100644 client/src/modules/ui/vue/components/generic/templates/SettingSwitch.html create mode 100644 client/src/styles/partials/spinners.scss diff --git a/client/src/modules/ui/vue/components/bd/CssEditor.vue b/client/src/modules/ui/vue/components/bd/CssEditor.vue index 9fed897d..8483e383 100644 --- a/client/src/modules/ui/vue/components/bd/CssEditor.vue +++ b/client/src/modules/ui/vue/components/bd/CssEditor.vue @@ -5,8 +5,8 @@ /*Imports*/ import { SettingsWrapper } from './'; - import { SettingSwitch } from '../generic'; - const components = { SettingsWrapper, SettingSwitch }; + import { SettingSwitch, FormButton } from '../generic'; + const components = { SettingsWrapper, SettingSwitch, FormButton }; function openInternalEditor() { CssEditor.show(); diff --git a/client/src/modules/ui/vue/components/bd/templates/CssEditor.html b/client/src/modules/ui/vue/components/bd/templates/CssEditor.html index d7fb4309..dea79bfa 100644 --- a/client/src/modules/ui/vue/components/bd/templates/CssEditor.html +++ b/client/src/modules/ui/vue/components/bd/templates/CssEditor.html @@ -4,23 +4,30 @@
Custom Editor
Custom Editor is not installed!
-
+ Install -
+
*This is displayed if editor is not installed -
+ Open -
+
System Editor
-
+ Open -
+
+ + Enabled + + + Disabled + + \ No newline at end of file diff --git a/client/src/modules/ui/vue/components/generic/Button.vue b/client/src/modules/ui/vue/components/generic/Button.vue new file mode 100644 index 00000000..e69de29b diff --git a/client/src/modules/ui/vue/components/generic/FormButton.vue b/client/src/modules/ui/vue/components/generic/FormButton.vue new file mode 100644 index 00000000..e20e3f9e --- /dev/null +++ b/client/src/modules/ui/vue/components/generic/FormButton.vue @@ -0,0 +1,11 @@ + + \ No newline at end of file diff --git a/client/src/modules/ui/vue/components/generic/ScrollerWrap.vue b/client/src/modules/ui/vue/components/generic/ScrollerWrap.vue index 3ea3a8f8..932dc9e8 100644 --- a/client/src/modules/ui/vue/components/generic/ScrollerWrap.vue +++ b/client/src/modules/ui/vue/components/generic/ScrollerWrap.vue @@ -1,2 +1,10 @@ - - \ No newline at end of file + + \ No newline at end of file diff --git a/client/src/modules/ui/vue/components/generic/SettingSwitch.vue b/client/src/modules/ui/vue/components/generic/SettingSwitch.vue index f98880d1..c14db968 100644 --- a/client/src/modules/ui/vue/components/generic/SettingSwitch.vue +++ b/client/src/modules/ui/vue/components/generic/SettingSwitch.vue @@ -1,4 +1,15 @@ - +