From a2fa74405bf5ed4177bf03e9854d64936df5a2b0 Mon Sep 17 00:00:00 2001 From: Tobias Klika Date: Thu, 9 Apr 2020 11:48:34 +0200 Subject: [PATCH] implement light+dark theme --- zero.Web/App/Components/Overlays/dropdown.vue | 4 +- zero.Web/App/Pages/login.vue | 43 ++++++++++++++ zero.Web/App/Pages/page.vue | 2 +- zero.Web/App/Services/auth.js | 3 +- zero.Web/App/app.vue | 33 +++++++++-- zero.Web/App/navigation.vue | 2 +- zero.Web/Sass/Core/_forms.scss | 4 +- zero.Web/Sass/Core/_settings.scss | 56 +++++++++++++------ zero.Web/Views/Index.cshtml | 2 +- 9 files changed, 118 insertions(+), 31 deletions(-) create mode 100644 zero.Web/App/Pages/login.vue diff --git a/zero.Web/App/Components/Overlays/dropdown.vue b/zero.Web/App/Components/Overlays/dropdown.vue index b0d8cb07..a4f54682 100644 --- a/zero.Web/App/Components/Overlays/dropdown.vue +++ b/zero.Web/App/Components/Overlays/dropdown.vue @@ -3,7 +3,7 @@
- @@ -81,7 +81,7 @@ background: var(--color-bg-mid); border-radius: var(--radius); border: 1px solid var(--color-line); - box-shadow: 0 0 20px var(--color-shadow); + /*box-shadow: 0 0 20px var(--color-shadow);*/ z-index: 8; top: calc(100% + 5px); diff --git a/zero.Web/App/Pages/login.vue b/zero.Web/App/Pages/login.vue new file mode 100644 index 00000000..32d80906 --- /dev/null +++ b/zero.Web/App/Pages/login.vue @@ -0,0 +1,43 @@ + + + + + + + \ No newline at end of file diff --git a/zero.Web/App/Pages/page.vue b/zero.Web/App/Pages/page.vue index d0abf9ac..79a05855 100644 --- a/zero.Web/App/Pages/page.vue +++ b/zero.Web/App/Pages/page.vue @@ -114,7 +114,7 @@ { display: grid; grid-template-columns: auto 1fr; - grid-gap: 1px; + grid-gap: 2px; justify-content: stretch; height: 100vh; } diff --git a/zero.Web/App/Services/auth.js b/zero.Web/App/Services/auth.js index e4c3d689..6d1ffe04 100644 --- a/zero.Web/App/Services/auth.js +++ b/zero.Web/App/Services/auth.js @@ -1,11 +1,10 @@ import Vue from 'vue'; -import Strings from 'zeroservices/strings'; import { find as _find, extend as _extend } from 'underscore'; export default new Vue({ data: () => ({ - isAuthenticated: false, + isAuthenticated: true, user: null }), diff --git a/zero.Web/App/app.vue b/zero.Web/App/app.vue index 5ea6ecbb..2845af39 100644 --- a/zero.Web/App/app.vue +++ b/zero.Web/App/app.vue @@ -1,10 +1,13 @@  @@ -12,8 +15,10 @@ \ No newline at end of file diff --git a/zero.Web/App/navigation.vue b/zero.Web/App/navigation.vue index 77d034d5..c6b010eb 100644 --- a/zero.Web/App/navigation.vue +++ b/zero.Web/App/navigation.vue @@ -1,5 +1,5 @@