From 08acff6acadd8669ca2268ce8934f2d550fbb671 Mon Sep 17 00:00:00 2001
From: haoxr <1490493387@qq.com>
Date: Sun, 26 Feb 2023 23:58:02 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20scss=E5=85=A8=E5=B1=80=E5=8F=98?=
 =?UTF-8?q?=E9=87=8F=E9=87=8D=E5=91=BD=E5=90=8D=E5=92=8C=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: bcfe8165225eec6d4982726ee26720ee57ec38e2
---
 src/layout/components/Sidebar/index.vue |  2 +-
 src/styles/global.scss                  | 12 +++++-------
 src/styles/index.scss                   |  3 +--
 src/styles/tailwind.scss                |  4 ----
 src/styles/ts-variables.module.scss     |  6 ------
 src/styles/variables.module.scss        | 17 ++++++-----------
 src/styles/variables.scss               | 11 +++++++++++
 7 files changed, 24 insertions(+), 31 deletions(-)
 delete mode 100644 src/styles/tailwind.scss
 delete mode 100644 src/styles/ts-variables.module.scss
 create mode 100644 src/styles/variables.scss

diff --git a/src/layout/components/Sidebar/index.vue b/src/layout/components/Sidebar/index.vue
index 345b6889..a55bd5f0 100644
--- a/src/layout/components/Sidebar/index.vue
+++ b/src/layout/components/Sidebar/index.vue
@@ -8,7 +8,7 @@ import { useSettingsStore } from '@/store/modules/settings';
 import { usePermissionStore } from '@/store/modules/permission';
 import { useAppStore } from '@/store/modules/app';
 import { storeToRefs } from 'pinia';
-import variables from '@/styles/ts-variables.module.scss';
+import variables from '@/styles/variables.module.scss';
 
 const settingsStore = useSettingsStore();
 const permissionStore = usePermissionStore();
diff --git a/src/styles/global.scss b/src/styles/global.scss
index 67450f0f..4fd984af 100644
--- a/src/styles/global.scss
+++ b/src/styles/global.scss
@@ -2,20 +2,18 @@ html,
 body,
 #app {
     height: 100%;
+    margin: 0;
+    padding: 0;
+}
+a{
+  text-decoration:none
 }
 
-// 隐藏元素光标
-label,span, p,li,img,a{
-  caret-color: transparent;
-}
 
 svg {
     vertical-align: -0.15em; //因icon大小被设置为和字体大小一致，而span等标签的下边缘会和字体的基线对齐，故需设置一个往下的偏移比例，来纠正视觉上的未对齐效果
 }
 
-img,svg{
-  display: inline-block;
-}
 
 // main-container global css
 .app-container {
diff --git a/src/styles/index.scss b/src/styles/index.scss
index 7b45efcb..d276710a 100644
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -1,5 +1,4 @@
 @import './sidebar.scss';
-@import './tailwind.scss';
 @import './global.scss';
 @import './dark.scss';
 
@@ -18,7 +17,7 @@
 
 html.dark{
   --menuBg:var(--el-bg-color-overlay);
-  --menuText:var(----el-menu-text-color);
+  --menuText:#fff;
   --menuActiveText:var(--el-menu-active-color);
   --menuHover:rgba(0,0,0,.2);
 
diff --git a/src/styles/tailwind.scss b/src/styles/tailwind.scss
deleted file mode 100644
index 9bb37ee6..00000000
--- a/src/styles/tailwind.scss
+++ /dev/null
@@ -1,4 +0,0 @@
-
-@tailwind base;
-@tailwind components;
-@tailwind utilities;
diff --git a/src/styles/ts-variables.module.scss b/src/styles/ts-variables.module.scss
deleted file mode 100644
index cbc114ae..00000000
--- a/src/styles/ts-variables.module.scss
+++ /dev/null
@@ -1,6 +0,0 @@
-// 导出 variables.module.scss 变量提供给TypeScript使用
-:export {
-    menuBg: $menuBg;
-    menuText: $menuText;
-    menuActiveText: $menuActiveText
-}
\ No newline at end of file
diff --git a/src/styles/variables.module.scss b/src/styles/variables.module.scss
index 84233837..cbc114ae 100644
--- a/src/styles/variables.module.scss
+++ b/src/styles/variables.module.scss
@@ -1,11 +1,6 @@
-// 全局SCSS变量
-$menuBg: var(--menuBg);
-$menuText: var(--menuText);
-$menuActiveText: var(--menuActiveText);
-$menuHover: var(--menuHover);
-
-$subMenuBg:var(--subMenuBg);
-$subMenuActiveText:var(--subMenuActiveText);
-$subMenuHover:var(--subMenuHover);
-
-$sideBarWidth: 210px;
+// 导出 variables.module.scss 变量提供给TypeScript使用
+:export {
+    menuBg: $menuBg;
+    menuText: $menuText;
+    menuActiveText: $menuActiveText
+}
\ No newline at end of file
diff --git a/src/styles/variables.scss b/src/styles/variables.scss
new file mode 100644
index 00000000..84233837
--- /dev/null
+++ b/src/styles/variables.scss
@@ -0,0 +1,11 @@
+// 全局SCSS变量
+$menuBg: var(--menuBg);
+$menuText: var(--menuText);
+$menuActiveText: var(--menuActiveText);
+$menuHover: var(--menuHover);
+
+$subMenuBg:var(--subMenuBg);
+$subMenuActiveText:var(--subMenuActiveText);
+$subMenuHover:var(--subMenuHover);
+
+$sideBarWidth: 210px;