diff --git a/src/assets/styles/mixin.scss b/src/assets/styles/mixin.scss index 081fd62..0a672c7 100644 --- a/src/assets/styles/mixin.scss +++ b/src/assets/styles/mixin.scss @@ -526,6 +526,20 @@ } } +@mixin checkboxAnddisabled-style{ + [data-theme="dark"] & { + border-color: $mainColor; + background: transparent; + } + [data-theme="light"] & { + border-color:#BECEFB; + background-color: #E9EEFD; + &::after{ + border-color:#BECEFB; + } + } +} + @mixin checkbox-active-style{ [data-theme="dark"] & { border-color: $mainColor; @@ -916,10 +930,12 @@ @mixin prepend-input{ [data-theme="dark"] & { + border:none; border-right: 1px solid $mainColor; color: #339cff !important; } [data-theme="light"] & { + border:none; border-right: 1px solid #E3E7EE; color: #545B65 !important; } @@ -1030,6 +1046,11 @@ border: 1px solid #FFA5A0; opacity: 0.6; } + &.soon-state{ + color: #FF8329; + border: 1px solid #FEBD98; + opacity: 0.6; + } } [data-theme="light"] & { &.ing-state{ @@ -1047,5 +1068,10 @@ background-color: #FFEBEA; border: 1px solid #FFA5A0; } + &.soon-state{ + color: #FF8329; + background-color: #FFF3E5; + border: 1px solid #FEBD98 + } } } \ No newline at end of file diff --git a/src/assets/styles/yxk-admin.scss b/src/assets/styles/yxk-admin.scss index 797eced..ebf7f2d 100644 --- a/src/assets/styles/yxk-admin.scss +++ b/src/assets/styles/yxk-admin.scss @@ -1319,6 +1319,10 @@ input[type ='number'] { @include checkbox-disabled-style; } +.el-checkbox__input.is-disabled.is-checked .el-checkbox__inner{ + @include checkboxAnddisabled-style; +} + .el-radio-button__orig-radio:checked+.el-radio-button__inner{ color: #0348F3; background-color: #E8F2FF; @@ -1744,7 +1748,7 @@ input[type ='number'] { background-color: transparent; border: none !important; height: 32px; - line-height: 32px; + line-height: 30px; .el-input__inner { padding: 0 10px !important; border-radius: 3px 0 0 3px; diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index 3c0edae..8326434 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -8,7 +8,7 @@ 深色主题 浅色主题 - +
-