diff --git a/src/components/AppProvider/index.vue b/src/components/AppProvider/index.vue index 2cc7b29..a708769 100644 --- a/src/components/AppProvider/index.vue +++ b/src/components/AppProvider/index.vue @@ -1,5 +1,5 @@ diff --git a/src/layout/components/sidebar/components/SideLogo.vue b/src/layout/components/sidebar/components/SideLogo.vue index 9ca4439..2944903 100644 --- a/src/layout/components/sidebar/components/SideLogo.vue +++ b/src/layout/components/sidebar/components/SideLogo.vue @@ -1,9 +1,11 @@ @@ -14,20 +16,3 @@ const title = import.meta.env.VITE_APP_TITLE const appStore = useAppStore() - - diff --git a/src/layout/components/sidebar/components/SideMenu.vue b/src/layout/components/sidebar/components/SideMenu.vue index 8fb4c67..626f3cb 100644 --- a/src/layout/components/sidebar/components/SideMenu.vue +++ b/src/layout/components/sidebar/components/SideMenu.vue @@ -2,8 +2,9 @@ diff --git a/src/layout/components/sidebar/index.vue b/src/layout/components/sidebar/index.vue index 02c49aa..ffd659d 100644 --- a/src/layout/components/sidebar/index.vue +++ b/src/layout/components/sidebar/index.vue @@ -5,6 +5,5 @@ import SideMenu from './components/SideMenu.vue' diff --git a/src/layout/components/tags/index.vue b/src/layout/components/tags/index.vue index ad7a7fa..50da674 100644 --- a/src/layout/components/tags/index.vue +++ b/src/layout/components/tags/index.vue @@ -99,11 +99,11 @@ async function handleContextMenu(e, tagItem) { transition: all 0.7s; &:hover { color: #fff; - background-color: $primaryColor; + background-color: var(--primaryColor); } } &:hover { - color: $primaryColor; + color: var(--primaryColor); } } diff --git a/src/layout/index.vue b/src/layout/index.vue index 11af62e..8634370 100644 --- a/src/layout/index.vue +++ b/src/layout/index.vue @@ -46,6 +46,5 @@ const appStore = useAppStore() height: 60px; background-color: #fff; border-bottom: 1px solid #eee; - border-left: 1px solid #eee; } diff --git a/src/main.js b/src/main.js index 1888c66..d543dc0 100644 --- a/src/main.js +++ b/src/main.js @@ -1,4 +1,5 @@ import '@/styles/reset.css' +import '@/styles/variables.css' import '@/styles/index.scss' import 'uno.css' diff --git a/src/styles/variables.css b/src/styles/variables.css new file mode 100644 index 0000000..1be1df8 --- /dev/null +++ b/src/styles/variables.css @@ -0,0 +1,3 @@ +:root { + --primaryColor: #316c72; +} diff --git a/src/styles/variables.scss b/src/styles/variables.scss deleted file mode 100644 index 3b990b6..0000000 --- a/src/styles/variables.scss +++ /dev/null @@ -1,5 +0,0 @@ -$primaryColor: #316c72; - -:root { - --vh100: 100vh; -} diff --git a/src/views/examples/table/post/PostCreate.vue b/src/views/examples/table/post/PostCreate.vue index 4d355d6..d550343 100644 --- a/src/views/examples/table/post/PostCreate.vue +++ b/src/views/examples/table/post/PostCreate.vue @@ -54,7 +54,7 @@ function handleSavePost(e) { margin-right: 20px; font-size: 20px; font-weight: bold; - color: $primaryColor; + color: var(--primaryColor); } } diff --git a/src/views/login/index.vue b/src/views/login/index.vue index 517938f..d2780b9 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -1,7 +1,7 @@