czg_team
/
video_admin
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

剔除node-sass改用sass3.0，修复部分sass3.0兼容警告

This commit is contained in:
YeMingfei666 2024-12-17 09:58:00 +08:00
parent 9fdeb22e15
commit 39b82e0b2e
4 changed files with 332 additions and 649 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

948
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

4
package.json
View File

@ -29,7 +29,6 @@
"lodash": "4.17.5", "lodash": "4.17.5",
"mockjs": "^1.1.0", "mockjs": "^1.1.0",
"npm": "^6.9.0", "npm": "^6.9.0",
"sass-loader": "6.0.6",
"svg-sprite-loader": "3.7.3", "svg-sprite-loader": "3.7.3",
"video.js": "^8.20.0", "video.js": "^8.20.0",
"videojs-contrib-hls": "^5.15.0", "videojs-contrib-hls": "^5.15.0",
@ -42,6 +41,8 @@
"vuex": "3.0.1" "vuex": "3.0.1"
}, },
"devDependencies": { "devDependencies": {
"sass": "^1.80.1",
"sass-loader": "^7.3.1",
"autoprefixer": "7.1.2", "autoprefixer": "7.1.2",
"babel-core": "6.22.1", "babel-core": "6.22.1",
"babel-eslint": "7.1.1", "babel-eslint": "7.1.1",
@ -77,7 +78,6 @@
"jest-serializer-vue": "0.3.0", "jest-serializer-vue": "0.3.0",
"nightwatch": "0.9.12", "nightwatch": "0.9.12",
"node-notifier": "5.1.2", "node-notifier": "5.1.2",
"node-sass": "^4.14.1",
"optimize-css-assets-webpack-plugin": "3.2.0", "optimize-css-assets-webpack-plugin": "3.2.0",
"ora": "1.2.0", "ora": "1.2.0",
"portfinder": "1.0.13", "portfinder": "1.0.13",

25
src/assets/scss/_base.scss
View File

@ -1,3 +1,4 @@
@use 'sass:color';
*, *,
*:before, *:before,
*:after { *:after {
@ -11,7 +12,8 @@ body {
background-color: #fff; background-color: #fff;
} }
a { a {
color: mix(#fff, $--color-primary, 20%); // color: mix(#fff, $--color-primary, 20%);
color: color.mix(#fff, $--color-primary, 20%);
text-decoration: none; text-decoration: none;
&:focus, &:focus,
&:hover { &:hover {
@ -137,12 +139,15 @@ img {
&:focus, &:focus,
&:hover { &:hover {
color: #fff; color: #fff;
background-color: mix(#000, $navbar--background-color, 15%); // background-color: mix(#000, $navbar--background-color, 15%);
background-color: color.mix(#000, $navbar--background-color, 15%);
} }
} }
> .el-menu-item.is-active, > .el-menu-item.is-active,
> .el-submenu.is-active > .el-submenu__title { > .el-submenu.is-active > .el-submenu__title {
border-bottom-color: mix(#fff, $navbar--background-color, 85%); // border-bottom-color: mix(#fff, $navbar--background-color, 85%);
border-bottom-color: color.mix(#fff, $navbar--background-color, 85%);
} }
.el-menu-item i, .el-menu-item i,
.el-submenu__title i, .el-submenu__title i,
@ -267,17 +272,23 @@ img {
color: $sidebar--color-text-dark; color: $sidebar--color-text-dark;
&:focus, &:focus,
&:hover { &:hover {
color: mix(#fff, $sidebar--color-text-dark, 50%); // color: mix(#fff, $sidebar--color-text-dark, 50%);
background-color: mix(#293749, $sidebar--background-color-dark, 65%); // background-color: mix(#293749, $sidebar--background-color-dark, 65%);
color: color.mix(#fff, $sidebar--color-text-dark, 50%);
background-color: color.mix(#293749, $sidebar--background-color-dark, 65%);
} }
} }
.el-menu, .el-menu,
.el-submenu.is-opened { .el-submenu.is-opened {
background-color: mix(#000, $sidebar--background-color-dark, 15%); // background-color: mix(#000, $sidebar--background-color-dark, 15%);
background-color: color.mix(#000, $sidebar--background-color-dark, 15%);
} }
.el-menu-item.is-active, .el-menu-item.is-active,
.el-submenu.is-active > .el-submenu__title { .el-submenu.is-active > .el-submenu__title {
color: mix(#4f9dec, $sidebar--color-text-dark, 100%); // color: mix(#4f9dec, $sidebar--color-text-dark, 100%);
color: color.mix(#4f9dec, $sidebar--color-text-dark, 100%);
} }
} }
} }

4
src/views/app/app.vue
View File

@ -623,7 +623,7 @@ export default {
</script> </script>
<style scoped> <style scoped>
/deep/ .file-box .el-upload { ::v-deep .file-box .el-upload {
width: 100%; width: 100%;
height: 100%; height: 100%;
box-sizing: border-box; box-sizing: border-box;
@ -632,7 +632,7 @@ export default {
justify-content: center; justify-content: center;
align-items: center; align-items: center;
} }
/deep/ .avatar-uploader { ::v-deep .avatar-uploader {
width: 100%; width: 100%;
box-sizing: border-box; box-sizing: border-box;
height: 100%; height: 100%;