diff --git a/package-lock.json b/package-lock.json index 8af0ff2f..7460deaf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -44,7 +44,7 @@ "eslint-plugin-vue": "^9.26.0", "iconify-icon": "^1.0.8", "postcss": "^8.4.38", - "sass": "^1.77.4", + "postcss-nested": "^6.0.1", "tailwindcss": "^3.4.4", "typescript": "^5.4.5", "unplugin-auto-import": "^0.17.6", @@ -5201,7 +5201,9 @@ "version": "4.3.6", "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.3.6.tgz", "integrity": "sha512-Ju0+lEMyzMVZarkTn/gqRpdqd5dOPaz1mCZ0SH3JV6iFw81PldE/PEB1hWVEA288HPt4WXW8O7AWxB10M+03QQ==", - "dev": true + "dev": true, + "optional": true, + "peer": true }, "node_modules/import-fresh": { "version": "3.3.0", @@ -6460,6 +6462,8 @@ "resolved": "https://registry.npmjs.org/sass/-/sass-1.77.6.tgz", "integrity": "sha512-ByXE1oLD79GVq9Ht1PeHWCPMPB8XHpBuz1r85oByKHjZY6qV6rWnQovQzXJXuQ/XyE1Oj3iPk3lo28uzaRA2/Q==", "dev": true, + "optional": true, + "peer": true, "dependencies": { "chokidar": ">=3.0.0 <4.0.0", "immutable": "^4.0.0", diff --git a/package.json b/package.json index e4c331c9..0f381cdd 100644 --- a/package.json +++ b/package.json @@ -48,7 +48,7 @@ "eslint-plugin-vue": "^9.26.0", "iconify-icon": "^1.0.8", "postcss": "^8.4.38", - "sass": "^1.77.4", + "postcss-nested": "^6.0.1", "tailwindcss": "^3.4.4", "typescript": "^5.4.5", "unplugin-auto-import": "^0.17.6", diff --git a/postcss.config.mjs b/postcss.config.mjs index e99ebc2c..cc2d7067 100644 --- a/postcss.config.mjs +++ b/postcss.config.mjs @@ -2,5 +2,6 @@ export default { plugins: { tailwindcss: {}, autoprefixer: {}, + 'postcss-nested': {}, }, } \ No newline at end of file diff --git a/src/components/Menu.vue b/src/components/Menu.vue index 6bd0c69c..da7ca57b 100644 --- a/src/components/Menu.vue +++ b/src/components/Menu.vue @@ -147,6 +147,6 @@ const store = useStore() const route = useRoute() - \ No newline at end of file diff --git a/src/components/PageAbout.vue b/src/components/PageAbout.vue index 4f903c5e..549b047d 100644 --- a/src/components/PageAbout.vue +++ b/src/components/PageAbout.vue @@ -143,7 +143,7 @@ onBeforeUnmount(() => { }) - - \ No newline at end of file diff --git a/src/components/misc/PageMiscBackup.vue b/src/components/misc/PageMiscBackup.vue index 297ff56d..5997f5c8 100644 --- a/src/components/misc/PageMiscBackup.vue +++ b/src/components/misc/PageMiscBackup.vue @@ -403,7 +403,7 @@ onBeforeMount(async () => { }) - - - \ No newline at end of file diff --git a/src/main.ts b/src/main.ts index 82176dc3..8cf50255 100644 --- a/src/main.ts +++ b/src/main.ts @@ -9,10 +9,10 @@ import App from "./App.vue"; // or use cdn, uncomment cdn link in `index.html` -import "~/styles/index.scss"; +import "~/styles/index.css"; // If you want to use ElMessage, import it. -import "element-plus/theme-chalk/src/message.scss" +// import "element-plus/theme-chalk/src/message.scss" import "element-plus/es/components/message-box/style/css" import "element-plus/es/components/dialog/style/css" import 'element-plus/theme-chalk/display.css' diff --git a/src/styles/index.scss b/src/styles/index.css similarity index 93% rename from src/styles/index.scss rename to src/styles/index.css index cbc1944f..9eaeb514 100644 --- a/src/styles/index.scss +++ b/src/styles/index.css @@ -44,9 +44,9 @@ p { @apply my-3; } -// :root { -// --el-color-primary: red; -// } +/*:root {*/ +/* --el-color-primary: red;*/ +/*}*/ body { margin: 0; @@ -81,13 +81,13 @@ code { } padding: 8px 16px; border-radius: 4px; - // border: 1px solid #dadada; + /*border: 1px solid #dadada;*/ border-left: 3px solid var(--el-color-primary); margin: 0px 0; } -// 弹窗优化 +/* 弹窗优化 */ @media screen and (max-width: 750px) { .el-message-box { width: 80% !important; diff --git a/vite.config.ts b/vite.config.ts index 8ef897db..5256beda 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -19,13 +19,6 @@ export default defineConfig({ "~/": `${pathSrc}/`, }, }, - css: { - preprocessorOptions: { - scss: { - additionalData: `@use "~/styles/element/index.scss" as *;`, - }, - }, - }, server: { port: 3000, }, @@ -46,7 +39,7 @@ export default defineConfig({ }, resolvers: [ ElementPlusResolver({ - importStyle: "sass", + importStyle: "css", }), IconsResolver(), ], @@ -54,7 +47,7 @@ export default defineConfig({ Components({ resolvers: [ ElementPlusResolver({ - importStyle: "sass", + importStyle: "css", }), IconsResolver(), ], @@ -64,7 +57,7 @@ export default defineConfig({ autoInstall: true, }), legacy({ - targets: ["defaults", "not IE 11"], + targets: ["defaults"], }), ], build: { @@ -76,10 +69,11 @@ export default defineConfig({ base: ["vue", "pinia", "vue-router"], element: ["element-plus"], codemirror: ["codemirror", "@codemirror/lang-javascript"], - network: ["axios", "axios-retry"], utils: [ "@vueuse/core", "asmcrypto.js", + "axios", + "axios-retry", "clipboard", "dayjs", "filesize",