From c249027be2654d7f8974408050d7d433f039e326 Mon Sep 17 00:00:00 2001 From: augushong Date: Mon, 18 Jul 2022 08:55:53 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=89=B9=E6=95=88=E7=9A=AE?= =?UTF-8?q?=E8=82=A4=E7=9A=84=E7=BB=86=E8=8A=82=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/common/command/admin/Version.php | 4 ++-- public/static/common/css/theme/_gtk.scss | 5 +++-- public/static/common/css/theme/_sicfi.scss | 26 +++++++++++++++++++++- public/static/common/css/theme/index.css | 26 +++++++++++++++++++--- scssindex.txt | 6 ++--- 5 files changed, 56 insertions(+), 11 deletions(-) diff --git a/app/common/command/admin/Version.php b/app/common/command/admin/Version.php index d41f9e1..5b5dd66 100644 --- a/app/common/command/admin/Version.php +++ b/app/common/command/admin/Version.php @@ -12,10 +12,10 @@ use think\console\Output; class Version extends Command { - const VERSION = 'v2.0.5'; + const VERSION = 'v2.0.6'; const COMMENT = [ - '实现表格的接口排序并且默认开启', + '完善特效皮肤的细节问题', ]; protected function configure() diff --git a/public/static/common/css/theme/_gtk.scss b/public/static/common/css/theme/_gtk.scss index 0006639..e4aef07 100644 --- a/public/static/common/css/theme/_gtk.scss +++ b/public/static/common/css/theme/_gtk.scss @@ -35,7 +35,7 @@ .layui-table { color : #2e3436; - background: transparent; + background: #f6f5f4; } .layui-table-view .layui-table[lay-size="sm"] .layui-table-cell { @@ -506,7 +506,8 @@ .layui-input, .layui-select, .layui-textarea, -.layui-upload-button { +.layui-upload-button, +.city-picker-span { border-radius: 5px; border : 1px solid #cdc7c2; } diff --git a/public/static/common/css/theme/_sicfi.scss b/public/static/common/css/theme/_sicfi.scss index 848193e..286dc12 100644 --- a/public/static/common/css/theme/_sicfi.scss +++ b/public/static/common/css/theme/_sicfi.scss @@ -525,11 +525,34 @@ $box-shape: polygon(0 0, 100% 0, 100% calc(100% - 10px), calc(100% - 10px) 100%, .layui-input, .layui-select, -.layui-textarea { +.layui-textarea, +.city-picker-span, +.main-input { background-color: $cover-color; color : $main-color; } +.city-picker-span>.title>span { + color: $main-color; + + &:hover { + background-color: $main-color; + color : $black-color; + } +} + +.layui-form-radio:hover *, +.layui-form-radioed, +.layui-form-radioed>i { + color: $main-color; +} + +.layui-form-checked[lay-skin="primary"] i { + border-color : $main-color !important; + background-color: $main-color; + color : $black-color; +} + .layui-input:focus, .layui-textarea:focus { border-color: $main-color !important; @@ -538,6 +561,7 @@ $box-shape: polygon(0 0, 100% 0, 100% calc(100% - 10px), calc(100% - 10px) 100%, .layui-input:hover, .layui-textarea:hover { border-color: $main-color !important; + } .layui-badge-rim, diff --git a/public/static/common/css/theme/index.css b/public/static/common/css/theme/index.css index e913737..632e924 100644 --- a/public/static/common/css/theme/index.css +++ b/public/static/common/css/theme/index.css @@ -445,10 +445,29 @@ } .elem-style-sicfi .layui-input, .elem-style-sicfi .layui-select, -.elem-style-sicfi .layui-textarea { +.elem-style-sicfi .layui-textarea, +.elem-style-sicfi .city-picker-span, +.elem-style-sicfi .main-input { background-color: rgba(62, 251, 251, 0.05); color: rgb(126, 252, 246); } +.elem-style-sicfi .city-picker-span > .title > span { + color: rgb(126, 252, 246); +} +.elem-style-sicfi .city-picker-span > .title > span:hover { + background-color: rgb(126, 252, 246); + color: rgb(2, 17, 20); +} +.elem-style-sicfi .layui-form-radio:hover *, +.elem-style-sicfi .layui-form-radioed, +.elem-style-sicfi .layui-form-radioed > i { + color: rgb(126, 252, 246); +} +.elem-style-sicfi .layui-form-checked[lay-skin=primary] i { + border-color: rgb(126, 252, 246) !important; + background-color: rgb(126, 252, 246); + color: rgb(2, 17, 20); +} .elem-style-sicfi .layui-input:focus, .elem-style-sicfi .layui-textarea:focus { border-color: rgb(126, 252, 246) !important; @@ -656,7 +675,7 @@ } .elem-style-gtk .layui-table { color: #2e3436; - background: transparent; + background: #f6f5f4; } .elem-style-gtk .layui-table-view .layui-table[lay-size=sm] .layui-table-cell { line-height: 30px; @@ -1047,7 +1066,8 @@ .elem-style-gtk .layui-input, .elem-style-gtk .layui-select, .elem-style-gtk .layui-textarea, -.elem-style-gtk .layui-upload-button { +.elem-style-gtk .layui-upload-button, +.elem-style-gtk .city-picker-span { border-radius: 5px; border: 1px solid #cdc7c2; } diff --git a/scssindex.txt b/scssindex.txt index c12b3a2..630162c 100644 --- a/scssindex.txt +++ b/scssindex.txt @@ -1,3 +1,3 @@ -"/public/static/common/css/theme/*.scss", -"/public/static/plugs/lay-module/tableData/tableData.scss", -"/public/static/plugs/lay-module/tagInput/tagInput.scss" \ No newline at end of file +public/static/common/css/theme/*.scss +public/static/plugs/lay-module/tableData/tableData.scss +public/static/plugs/lay-module/tagInput/tagInput.scss \ No newline at end of file