From 59b883ff7f7624e9b4d5763ad738f9ae6772fe6e Mon Sep 17 00:00:00 2001 From: MaysWind Date: Fri, 23 Jun 2023 18:01:11 +0800 Subject: [PATCH] modify style --- src/styles/desktop/configured-variables/_template.scss | 1 + src/styles/desktop/configured-variables/_vuetify.scss | 3 +++ src/styles/desktop/template/base/_components.scss | 2 +- src/styles/desktop/template/base/_dark.scss | 2 +- .../desktop/template/base/_default-layout-w-vertical-nav.scss | 2 +- src/styles/desktop/template/base/_layouts.scss | 2 +- src/styles/desktop/template/base/_utilities.scss | 2 +- src/styles/desktop/template/base/_utils.scss | 2 +- src/styles/desktop/template/base/_variables.scss | 2 +- src/styles/desktop/template/base/_vertical-nav.scss | 2 +- src/styles/desktop/template/base/libs/vuetify/_overrides.scss | 2 +- .../base/placeholders/_default-layout-vertical-nav.scss | 2 +- .../desktop/template/base/placeholders/_vertical-nav.scss | 2 +- .../desktop/template/configured-variables/_template.scss | 1 - src/styles/desktop/template/configured-variables/_vuetify.scss | 1 - src/styles/desktop/template/layout/_default-layout.scss | 2 +- src/styles/desktop/template/layout/_mixins.scss | 2 +- src/styles/desktop/template/layout/_placeholders.scss | 2 +- .../desktop/template/layout/component/vertical-nav-layout.scss | 2 +- src/styles/desktop/template/layout/component/vertical-nav.scss | 2 +- src/styles/desktop/template/template/_components.scss | 2 +- src/styles/desktop/template/template/_variables.scss | 2 +- .../desktop/template/template/placeholders/_vertical-nav.scss | 2 +- vite.config.js | 2 +- 24 files changed, 24 insertions(+), 22 deletions(-) create mode 100644 src/styles/desktop/configured-variables/_template.scss create mode 100644 src/styles/desktop/configured-variables/_vuetify.scss delete mode 100644 src/styles/desktop/template/configured-variables/_template.scss delete mode 100644 src/styles/desktop/template/configured-variables/_vuetify.scss diff --git a/src/styles/desktop/configured-variables/_template.scss b/src/styles/desktop/configured-variables/_template.scss new file mode 100644 index 00000000..d9a3d4c7 --- /dev/null +++ b/src/styles/desktop/configured-variables/_template.scss @@ -0,0 +1 @@ +@forward "@/styles/desktop/template/template/variables"; diff --git a/src/styles/desktop/configured-variables/_vuetify.scss b/src/styles/desktop/configured-variables/_vuetify.scss new file mode 100644 index 00000000..772f2b25 --- /dev/null +++ b/src/styles/desktop/configured-variables/_vuetify.scss @@ -0,0 +1,3 @@ +@forward "@/styles/desktop/template/vuetify/variables" with ( + $input-chips-margin-top: 0 +); diff --git a/src/styles/desktop/template/base/_components.scss b/src/styles/desktop/template/base/_components.scss index 46489219..0dd900c9 100644 --- a/src/styles/desktop/template/base/_components.scss +++ b/src/styles/desktop/template/base/_components.scss @@ -4,7 +4,7 @@ @use "./mixins"; @use "vuetify/lib/styles/tools/_elevation" as mixins_elevation; @use "@/styles/desktop/template/layout/placeholders"; -@use "@/styles/desktop/template/configured-variables/template" as variables; +@use "@/styles/desktop/configured-variables/template" as variables; // 👉 Avatar group .v-avatar-group { diff --git a/src/styles/desktop/template/base/_dark.scss b/src/styles/desktop/template/base/_dark.scss index 38e1e68d..8d920797 100644 --- a/src/styles/desktop/template/base/_dark.scss +++ b/src/styles/desktop/template/base/_dark.scss @@ -1,7 +1,7 @@ /** Materio Template base classes **/ /** https://github.com/themeselection/materio-vuetify-vuejs-admin-template-free **/ -@use "@/styles/desktop/template/configured-variables/template" as variables; +@use "@/styles/desktop/configured-variables/template" as variables; // ———————————————————————————————————— // * ——— Perfect Scrollbar diff --git a/src/styles/desktop/template/base/_default-layout-w-vertical-nav.scss b/src/styles/desktop/template/base/_default-layout-w-vertical-nav.scss index a420cc28..ce8a7a60 100644 --- a/src/styles/desktop/template/base/_default-layout-w-vertical-nav.scss +++ b/src/styles/desktop/template/base/_default-layout-w-vertical-nav.scss @@ -1,7 +1,7 @@ /** Materio Template base classes **/ /** https://github.com/themeselection/materio-vuetify-vuejs-admin-template-free **/ -@use "@/styles/desktop/template/configured-variables/template" as variables; +@use "@/styles/desktop/configured-variables/template" as variables; @use "./placeholders" as *; @use "@/styles/desktop/template/template/placeholders" as *; @use "vuetify/lib/styles/tools/_elevation" as mixins_elevation; diff --git a/src/styles/desktop/template/base/_layouts.scss b/src/styles/desktop/template/base/_layouts.scss index 241fea38..cb469ef1 100644 --- a/src/styles/desktop/template/base/_layouts.scss +++ b/src/styles/desktop/template/base/_layouts.scss @@ -1,7 +1,7 @@ /** Materio Template base classes **/ /** https://github.com/themeselection/materio-vuetify-vuejs-admin-template-free **/ -@use "@/styles/desktop/template/configured-variables/template" as variables; +@use "@/styles/desktop/configured-variables/template" as variables; /* â„šī¸ This styles extends the existing layout package's styles for handling cases that aren't related to layouts package */ diff --git a/src/styles/desktop/template/base/_utilities.scss b/src/styles/desktop/template/base/_utilities.scss index f6393665..7ca42b2d 100644 --- a/src/styles/desktop/template/base/_utilities.scss +++ b/src/styles/desktop/template/base/_utilities.scss @@ -1,7 +1,7 @@ /** Materio Template base classes **/ /** https://github.com/themeselection/materio-vuetify-vuejs-admin-template-free **/ -@use "@/styles/desktop/template/configured-variables/template" as variables; +@use "@/styles/desktop/configured-variables/template" as variables; @use "@/styles/desktop/template/layout/mixins" as layoutsMixins; $card-spacer-content: 16px; diff --git a/src/styles/desktop/template/base/_utils.scss b/src/styles/desktop/template/base/_utils.scss index 2acba816..c8ae6242 100644 --- a/src/styles/desktop/template/base/_utils.scss +++ b/src/styles/desktop/template/base/_utils.scss @@ -3,7 +3,7 @@ @use "sass:map"; @use "sass:list"; -@use "@/styles/desktop/template/configured-variables/template" as variables; +@use "@/styles/desktop/configured-variables/template" as variables; // Thanks: https://css-tricks.com/snippets/sass/deep-getset-maps/ @function map-deep-get($map, $keys...) { diff --git a/src/styles/desktop/template/base/_variables.scss b/src/styles/desktop/template/base/_variables.scss index 14177d5e..9a7ca52f 100644 --- a/src/styles/desktop/template/base/_variables.scss +++ b/src/styles/desktop/template/base/_variables.scss @@ -3,7 +3,7 @@ @use "vuetify/lib/styles/tools/functions" as *; -@forward "../layout/variables" with ( +@forward "@/styles/desktop/template/layout/variables" with ( // Adjust z-index so vertical nav & overlay stays on top of v-layout in v-main. E.g. Email app $layout-vertical-nav-z-index: 1004, $layout-overlay-z-index: 1003, diff --git a/src/styles/desktop/template/base/_vertical-nav.scss b/src/styles/desktop/template/base/_vertical-nav.scss index a45aaca2..ea21b206 100644 --- a/src/styles/desktop/template/base/_vertical-nav.scss +++ b/src/styles/desktop/template/base/_vertical-nav.scss @@ -4,7 +4,7 @@ @use "./placeholders" as *; @use "@/styles/desktop/template/template/placeholders" as *; @use "@/styles/desktop/template/layout/mixins" as layoutsMixins; -@use "@/styles/desktop/template/configured-variables/template" as variables; +@use "@/styles/desktop/configured-variables/template" as variables; @use "./mixins" as mixins; @use "vuetify/lib/styles/tools/states" as vuetifyStates; diff --git a/src/styles/desktop/template/base/libs/vuetify/_overrides.scss b/src/styles/desktop/template/base/libs/vuetify/_overrides.scss index d0f408c3..2f6e92e9 100644 --- a/src/styles/desktop/template/base/libs/vuetify/_overrides.scss +++ b/src/styles/desktop/template/base/libs/vuetify/_overrides.scss @@ -2,7 +2,7 @@ /** https://github.com/themeselection/materio-vuetify-vuejs-admin-template-free **/ @use "@/styles/desktop/template/base/utils"; -@use "@/styles/desktop/template/configured-variables/template" as variables; +@use "@/styles/desktop/configured-variables/template" as variables; // 👉 Application // â„šī¸ We need accurate vh in mobile devices as well diff --git a/src/styles/desktop/template/base/placeholders/_default-layout-vertical-nav.scss b/src/styles/desktop/template/base/placeholders/_default-layout-vertical-nav.scss index b812694b..73e382e6 100644 --- a/src/styles/desktop/template/base/placeholders/_default-layout-vertical-nav.scss +++ b/src/styles/desktop/template/base/placeholders/_default-layout-vertical-nav.scss @@ -1,7 +1,7 @@ /** Materio Template base classes **/ /** https://github.com/themeselection/materio-vuetify-vuejs-admin-template-free **/ -@use "@/styles/desktop/template/configured-variables/template" as variables; +@use "@/styles/desktop/configured-variables/template" as variables; @use "./misc"; @use "@/styles/desktop/template/base/mixins"; diff --git a/src/styles/desktop/template/base/placeholders/_vertical-nav.scss b/src/styles/desktop/template/base/placeholders/_vertical-nav.scss index 84ad0c39..e934825f 100644 --- a/src/styles/desktop/template/base/placeholders/_vertical-nav.scss +++ b/src/styles/desktop/template/base/placeholders/_vertical-nav.scss @@ -2,7 +2,7 @@ /** https://github.com/themeselection/materio-vuetify-vuejs-admin-template-free **/ @use "@/styles/desktop/template/base/mixins"; -@use "@/styles/desktop/template/configured-variables/template" as variables; +@use "@/styles/desktop/configured-variables/template" as variables; @use "vuetify/lib/styles/tools/states" as vuetifyStates; %nav-header-action { diff --git a/src/styles/desktop/template/configured-variables/_template.scss b/src/styles/desktop/template/configured-variables/_template.scss deleted file mode 100644 index 7c02e4ba..00000000 --- a/src/styles/desktop/template/configured-variables/_template.scss +++ /dev/null @@ -1 +0,0 @@ -@forward "../template/variables"; diff --git a/src/styles/desktop/template/configured-variables/_vuetify.scss b/src/styles/desktop/template/configured-variables/_vuetify.scss deleted file mode 100644 index 9f3132f9..00000000 --- a/src/styles/desktop/template/configured-variables/_vuetify.scss +++ /dev/null @@ -1 +0,0 @@ -@forward "../vuetify/variables"; diff --git a/src/styles/desktop/template/layout/_default-layout.scss b/src/styles/desktop/template/layout/_default-layout.scss index 2d1ac1dc..5b96f755 100644 --- a/src/styles/desktop/template/layout/_default-layout.scss +++ b/src/styles/desktop/template/layout/_default-layout.scss @@ -5,7 +5,7 @@ @use "./rtl"; @use "./placeholders"; @use "./mixins"; -@use "@/styles/desktop/template/configured-variables/template" as variables; +@use "@/styles/desktop/configured-variables/template" as variables; html, body { diff --git a/src/styles/desktop/template/layout/_mixins.scss b/src/styles/desktop/template/layout/_mixins.scss index 8aed90d4..58c90736 100644 --- a/src/styles/desktop/template/layout/_mixins.scss +++ b/src/styles/desktop/template/layout/_mixins.scss @@ -2,7 +2,7 @@ /** https://github.com/themeselection/materio-vuetify-vuejs-admin-template-free **/ @use "./placeholders"; -@use "@/styles/desktop/template/configured-variables/template" as variables; +@use "@/styles/desktop/configured-variables/template" as variables; @mixin rtl { @if variables.$enable-rtl-styles { diff --git a/src/styles/desktop/template/layout/_placeholders.scss b/src/styles/desktop/template/layout/_placeholders.scss index a8e18369..9c90d2e9 100644 --- a/src/styles/desktop/template/layout/_placeholders.scss +++ b/src/styles/desktop/template/layout/_placeholders.scss @@ -2,7 +2,7 @@ /** https://github.com/themeselection/materio-vuetify-vuejs-admin-template-free **/ // placeholders -@use "@/styles/desktop/template/configured-variables/template" as variables; +@use "@/styles/desktop/configured-variables/template" as variables; %boxed-content { @at-root #{&}-spacing { diff --git a/src/styles/desktop/template/layout/component/vertical-nav-layout.scss b/src/styles/desktop/template/layout/component/vertical-nav-layout.scss index 734179b6..9b262eb4 100644 --- a/src/styles/desktop/template/layout/component/vertical-nav-layout.scss +++ b/src/styles/desktop/template/layout/component/vertical-nav-layout.scss @@ -1,7 +1,7 @@ /** Materio Template layout styles **/ /** https://github.com/themeselection/materio-vuetify-vuejs-admin-template-free **/ -@use "@/styles/desktop/template/configured-variables/template" as variables; +@use "@/styles/desktop/configured-variables/template" as variables; @use "@/styles/desktop/template/layout/placeholders"; @use "@/styles/desktop/template/layout/mixins"; diff --git a/src/styles/desktop/template/layout/component/vertical-nav.scss b/src/styles/desktop/template/layout/component/vertical-nav.scss index 4878deca..7f64ca41 100644 --- a/src/styles/desktop/template/layout/component/vertical-nav.scss +++ b/src/styles/desktop/template/layout/component/vertical-nav.scss @@ -1,7 +1,7 @@ /** Materio Template layout styles **/ /** https://github.com/themeselection/materio-vuetify-vuejs-admin-template-free **/ -@use "@/styles/desktop/template/configured-variables/template" as variables; +@use "@/styles/desktop/configured-variables/template" as variables; @use "@/styles/desktop/template/layout/mixins"; // 👉 Vertical Nav diff --git a/src/styles/desktop/template/template/_components.scss b/src/styles/desktop/template/template/_components.scss index 701830d7..84a09513 100644 --- a/src/styles/desktop/template/template/_components.scss +++ b/src/styles/desktop/template/template/_components.scss @@ -2,7 +2,7 @@ /** https://github.com/themeselection/materio-vuetify-vuejs-admin-template-free **/ @use "vuetify/lib/styles/tools/_elevation" as mixins_elevation; -@use "@/styles/desktop/template/configured-variables/template" as variables; +@use "@/styles/desktop/configured-variables/template" as variables; @use "./mixins"; @use "@/styles/desktop/template/base/mixins" as mixins_base; diff --git a/src/styles/desktop/template/template/_variables.scss b/src/styles/desktop/template/template/_variables.scss index f0806ccb..524271a6 100644 --- a/src/styles/desktop/template/template/_variables.scss +++ b/src/styles/desktop/template/template/_variables.scss @@ -16,7 +16,7 @@ $vertical-nav-horizontal-padding-custom: 1.375rem 1rem; $vertical-nav-horizontal-padding-start: utils.get-first-value($vertical-nav-horizontal-padding-custom) !default; $vertical-nav-items-icon-margin-inline-end: 0.625rem !default; -@forward "../base/variables" with ( +@forward "@/styles/desktop/template/base/variables" with ( $layout-vertical-nav-collapsed-width: 68px !default, // â„šī¸ This is used to keep consistency between nav items and nav header left & right margin // This is used by nav items & nav header diff --git a/src/styles/desktop/template/template/placeholders/_vertical-nav.scss b/src/styles/desktop/template/template/placeholders/_vertical-nav.scss index 4eb4d9d6..1e900247 100644 --- a/src/styles/desktop/template/template/placeholders/_vertical-nav.scss +++ b/src/styles/desktop/template/template/placeholders/_vertical-nav.scss @@ -1,7 +1,7 @@ /** Materio Template styles **/ /** https://github.com/themeselection/materio-vuetify-vuejs-admin-template-free **/ -@use "@/styles/desktop/template/configured-variables/template" as variables; +@use "@/styles/desktop/configured-variables/template" as variables; // â„šī¸ Add divider around section title %vertical-nav-section-title { diff --git a/vite.config.js b/vite.config.js index 3c49689e..98abaddf 100644 --- a/vite.config.js +++ b/vite.config.js @@ -38,7 +38,7 @@ export default defineConfig(async () => { }), vuetify({ styles: { - configFile: 'styles/desktop/template/configured-variables/_vuetify.scss' + configFile: 'styles/desktop/configured-variables/_vuetify.scss' } }), VitePWA({