diff --git a/public/static/common/css/theme/_fresh.scss b/public/static/common/css/theme/_fresh.scss index cb67958..f13bd5a 100644 --- a/public/static/common/css/theme/_fresh.scss +++ b/public/static/common/css/theme/_fresh.scss @@ -593,8 +593,12 @@ $shadow-pop: 0 6px 16px rgba(31, 35, 41, .08); border-color: $main; } -.layui-form-checked > div, -.layui-form-checked:hover > div { +// 老式 pill 风格(显式 lay-skin="checkbox")的文字底接管,primary 必须排除(issue #7): +// layui 原版绿底规则 (0,1,1) 打不过 primary 文字重置 (0,2,1),故原版 primary 勾选文字无底色; +// 包装后若不排除则与重置 (0,2,1) 打平且靠加载顺序取胜(layui.css 经 public.css 顶部 @import +// 引入,本文件在后),会把 primary 勾选文字染成蓝底灰字。:not 收窄后仅 pill 风格命中。 +.layui-form-checkbox:not([lay-skin=primary]).layui-form-checked > div, +.layui-form-checkbox:not([lay-skin=primary]).layui-form-checked:hover > div { background-color: $main; } @@ -609,6 +613,12 @@ $shadow-pop: 0 6px 16px rgba(31, 35, 41, .08); color : #fff; } +// primary 勾选态文字(issue #7 定案:无背景色——背景交给 layui 重置的 background:0 0, +// 仅文字颜色变化;包裹后 (0,3,1) 稳赢重置 (0,2,1),未选中态不受影响) +.layui-form-checked[lay-skin=primary] > div { + color: $main; +} + // G2 单选与开关 .layui-form-radioed, .layui-form-radioed > i { diff --git a/public/static/common/css/theme/index.css b/public/static/common/css/theme/index.css index cefedee..a57d527 100644 --- a/public/static/common/css/theme/index.css +++ b/public/static/common/css/theme/index.css @@ -2549,8 +2549,8 @@ .elem-style-fresh .layui-form-checked:hover { border-color: #1E9FFF; } -.elem-style-fresh .layui-form-checked > div, -.elem-style-fresh .layui-form-checked:hover > div { +.elem-style-fresh .layui-form-checkbox:not([lay-skin=primary]).layui-form-checked > div, +.elem-style-fresh .layui-form-checkbox:not([lay-skin=primary]).layui-form-checked:hover > div { background-color: #1E9FFF; } .elem-style-fresh .layui-form-checked > i, @@ -2562,6 +2562,9 @@ background-color: #1E9FFF; color: #fff; } +.elem-style-fresh .layui-form-checked[lay-skin=primary] > div { + color: #1E9FFF; +} .elem-style-fresh .layui-form-radioed, .elem-style-fresh .layui-form-radioed > i { color: #1E9FFF;