From 880da817a6080d93adb050cc3e1dc6bc2051795d Mon Sep 17 00:00:00 2001 From: KyleBing Date: Wed, 25 Nov 2020 14:38:29 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9A=97=E9=BB=91=E6=A8=A1=E5=BC=8F=E9=A2=9C?= =?UTF-8?q?=E8=89=B2=E8=B0=83=E6=95=B4=EF=BC=8C=E8=BD=BD=E5=85=A5=E9=A1=B5?= =?UTF-8?q?=E9=A2=9C=E8=89=B2=E9=80=82=E9=85=8D=E9=BB=91=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/index.html | 2 +- src/scss/_dark-mode.scss | 4 ++-- src/scss/_normal.scss | 9 +++++---- src/scss/_variables.scss | 32 ++++++++++++++++++-------------- 4 files changed, 26 insertions(+), 21 deletions(-) diff --git a/public/index.html b/public/index.html index 4e160ba..f279b09 100644 --- a/public/index.html +++ b/public/index.html @@ -13,7 +13,7 @@ - + diff --git a/src/scss/_dark-mode.scss b/src/scss/_dark-mode.scss index 8377f28..7738992 100644 --- a/src/scss/_dark-mode.scss +++ b/src/scss/_dark-mode.scss @@ -102,13 +102,13 @@ color: $dark-text-info; } .el-upload-dragger{ - background-color: $dark-btn-bg; + background-color: $dark-uploader-bg; border-color: $dark-border; .el-upload__text{ color: $dark-text-info; } &:hover{ - background: $dark-btn-bg; + background: $dark-uploader-bg-highlight; border-color: $dark-border-highlight; } } diff --git a/src/scss/_normal.scss b/src/scss/_normal.scss index c393e9f..69ace39 100644 --- a/src/scss/_normal.scss +++ b/src/scss/_normal.scss @@ -1,9 +1,11 @@ -#app { +body{ + font-family: $font-family; font-size: $fz-main; - font-family: "Helvetica Neue", Helvetica, "PingFang SC", - "Hiragino Sans GB", "Microsoft YaHei", "微软雅黑", Arial, sans-serif; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; +} + +#app { text-align: center; color: $text-main; padding-top: 30px; @@ -28,7 +30,6 @@ audio{ margin-bottom: 15px; // 播放控件与表格间隔 } - a{ color: darken($color-link, 15%); &:hover{ diff --git a/src/scss/_variables.scss b/src/scss/_variables.scss index c4b1319..86bd31f 100644 --- a/src/scss/_variables.scss +++ b/src/scss/_variables.scss @@ -3,22 +3,26 @@ $blue : #409EFF; $red : #F56C6C; $green : #85ce61; +// TEXT $text-main : #2C3E50; - $color-link: $blue; -// 暗黑模式 -$dark-border : lighten(black, 30%); -$dark-border-highlight : lighten(black, 55%); -$dark-bg : lighten(black, 8%); -$dark-text-main : lighten(black, 90%); -$dark-text-info : lighten(black, 60%); -$dark-btn-bg : lighten(black, 20%); -$dark-btn-bg-highlight : lighten(black, 30%); -$dark-bg-th : lighten(black, 20%); -$dark-bg-td : lighten(black, 15%); -$dark-color-link : $green; +$fz-main: 14px; + +$font-family: "Helvetica Neue", Helvetica, "PingFang SC", +"Hiragino Sans GB", "Microsoft YaHei", "微软雅黑", Arial, sans-serif; -// 字体大小 -$fz-main: 14px; \ No newline at end of file +// DARK MODE +$dark-border : lighten(black, 25%); +$dark-border-highlight : lighten(black, 55%); +$dark-bg : lighten(black, 10%); +$dark-text-main : lighten(black, 90%); +$dark-text-info : lighten(black, 60%); +$dark-uploader-bg : lighten(black, 13%); +$dark-uploader-bg-highlight : lighten(black, 18%); +$dark-btn-bg : lighten(black, 20%); +$dark-btn-bg-highlight : lighten(black, 30%); +$dark-bg-th : lighten(black, 18%); +$dark-bg-td : lighten(black, 13%); +$dark-color-link : $green; \ No newline at end of file