diff --git a/public/static/common/css/theme/_nes.scss b/public/static/common/css/theme/_nes.scss index 046c4a6..7118715 100644 --- a/public/static/common/css/theme/_nes.scss +++ b/public/static/common/css/theme/_nes.scss @@ -4,17 +4,17 @@ button { } & { - cursor : url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAABFklEQVRYR9WXURLDIAhE6/0PbSdOtUpcd1Gnpv1KGpTHBpCE1/cXq+vrMph7dGvXZTtpfW10DCA5jrH1H0Jhs5E0hnZdCR+vb5S8Nn8mQCeS9BdSalYJqMBjAGzq59xAESN7VFVUgV8AZB/dZBR7QTFDCqGquvUBVVoEtgIwpQRzmANSFHgWQKExHdIrPeuMvQNDarXe6nC/AutgV3JW+6bgqQLeV8FekRtgV+ToDKEKnACYKsfZjjkam7a0ZpYTytwmgainpC3HvwBocgKOxqRjehoR9DFKNFYtOwCGYCszobeCbl26N6yyQ6g8X/Wex/rBPsNEV6qAMaJPMynIHQCoSqS9JSMmwef51LflTgCRszU7DvAGiV6mHWfsaVUAAAAASUVORK5CYII=), auto; + cursor: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAABFklEQVRYR9WXURLDIAhE6/0PbSdOtUpcd1Gnpv1KGpTHBpCE1/cXq+vrMph7dGvXZTtpfW10DCA5jrH1H0Jhs5E0hnZdCR+vb5S8Nn8mQCeS9BdSalYJqMBjAGzq59xAESN7VFVUgV8AZB/dZBR7QTFDCqGquvUBVVoEtgIwpQRzmANSFHgWQKExHdIrPeuMvQNDarXe6nC/AutgV3JW+6bgqQLeV8FekRtgV+ToDKEKnACYKsfZjjkam7a0ZpYTytwmgainpC3HvwBocgKOxqRjehoR9DFKNFYtOwCGYCszobeCbl26N6yyQ6g8X/Wex/rBPsNEV6qAMaJPMynIHQCoSqS9JSMmwef51LflTgCRszU7DvAGiV6mHWfsaVUAAAAASUVORK5CYII=), auto; font-family: "ark-pixel"; } $border-line-width:3px; .public-border { - border-style : solid; - border-width : $border-line-width; - border-image-slice : 2; - border-image-width : 2; + border-style: solid; + border-width: $border-line-width; + border-image-slice: 2; + border-image-width: 2; border-image-repeat: stretch; border-image-source: url('data:image/svg+xml;utf8,'); border-image-outset: 2; @@ -27,32 +27,32 @@ $border-line-width:3px; @extend .public-border; line-height: 32px; - position : relative; - display : inline-block; - text-align : center; - vertical-align : middle; - cursor : url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAzElEQVRYR+2X0Q6AIAhF5f8/2jYXZkwEjNSVvVUjDpcrGgT7FUkI2D9xRfQETwNIiWO85wfINfQUEyxBG2ArsLwC0jioGt5zFcwF4OYDPi/mBYKm4t0U8ATgRm3ThFoAqkhNgWkA0jJLvaOVSs7j3qMnSgXWBMiWPXe94QqMBMBc1VZIvaTu5u5pQewq0EqNZvIEMCmxAawK0DNkay9QmfFNAJUXfgGgUkLaE7j/h8fnASkxHTz0DGIBMCnBeeM7AArpUd3mz2x3C7wADglA8BcWMZhZAAAAAElFTkSuQmCC) 14 0, pointer; + position: relative; + display: inline-block; + text-align: center; + vertical-align: middle; + cursor: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAzElEQVRYR+2X0Q6AIAhF5f8/2jYXZkwEjNSVvVUjDpcrGgT7FUkI2D9xRfQETwNIiWO85wfINfQUEyxBG2ArsLwC0jioGt5zFcwF4OYDPi/mBYKm4t0U8ATgRm3ThFoAqkhNgWkA0jJLvaOVSs7j3qMnSgXWBMiWPXe94QqMBMBc1VZIvaTu5u5pQewq0EqNZvIEMCmxAawK0DNkay9QmfFNAJUXfgGgUkLaE7j/h8fnASkxHTz0DGIBMCnBeeM7AArpUd3mz2x3C7wADglA8BcWMZhZAAAAAElFTkSuQmCC) 14 0, pointer; -webkit-user-select: none; - -moz-user-select : none; - -ms-user-select : none; - user-select : none; - color : #212529; - background-color : #fff; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; + color: #212529; + background-color: #fff; border-image-repeat: stretch; &::after { - position : absolute; - top : -$border-line-width; - right : -$border-line-width; - bottom : -$border-line-width; - left : -$border-line-width; - content : ""; + position: absolute; + top: -$border-line-width; + right: -$border-line-width; + bottom: -$border-line-width; + left: -$border-line-width; + content: ""; box-shadow: inset (-$border-line-width) (-$border-line-width) #adafbc; } &:hover { - color : #212529; - text-decoration : none; + color: #212529; + text-decoration: none; background-color: #e7e7e7; } @@ -65,7 +65,7 @@ $border-line-width:3px; } &.layui-btn-normal { - color : #fff; + color: #fff; background-color: #209cee; &::after { @@ -78,7 +78,7 @@ $border-line-width:3px; } &.layui-btn-success { - color : #fff; + color: #fff; background-color: #92cc41; &::after { @@ -91,7 +91,7 @@ $border-line-width:3px; } &.layui-btn-danger { - color : #fff; + color: #fff; background-color: #e76e55; &::after { @@ -104,7 +104,7 @@ $border-line-width:3px; } &.layui-btn-warm { - color : #212529; + color: #212529; background-color: #f7d51d; &::after { @@ -112,7 +112,7 @@ $border-line-width:3px; } &:hover { - color : #212529; + color: #212529; background-color: #f2c409; } } @@ -120,7 +120,7 @@ $border-line-width:3px; .form-search .layui-btn { line-height: 16px; - font-size : 14px; + font-size: 14px; } @@ -140,9 +140,9 @@ $border-line-width:3px; .layui-form-checked[lay-skin="primary"] i { background-color: unset; - color : #212529; - font-weight : bold; - font-size : 28px; + color: #212529; + font-weight: bold; + font-size: 28px; } .layui-btn { @@ -179,7 +179,7 @@ $border-line-width:3px; .layui-table td, .layui-table th { - font-size : 16px; + font-size: 16px; border-width: 0 2px 2px 0; border-style: solid; border-color: #212529 @@ -193,11 +193,11 @@ $border-line-width:3px; .layui-form-label { background-color: unset; - border : unset; - text-align : right; - color : #212529; - font-size : 16px; - font-weight : bold; + border: unset; + text-align: right; + color: #212529; + font-size: 16px; + font-weight: bold; } .layuimini-form>.layui-form-item>.layui-input-block tip, @@ -207,8 +207,9 @@ $border-line-width:3px; .layui-layer-easy .layui-layer-title { background: unset !important; - color : #212529 !important; - font-size : 16px; + color: #212529 !important; + font-size: 16px; + border-bottom: 1px solid #f0f0f0; } .layui-layer-easy .layui-layer-btn { @@ -220,7 +221,7 @@ $border-line-width:3px; color: #212529 !important; &.layui-layer-btn0 { - color : #fff !important; + color: #fff !important; background-color: #209cee; &::after { @@ -238,11 +239,25 @@ $border-line-width:3px; font-size: 16px; } -.layui-layer-easy .layui-layer-setwin>a:after { +.layui-layer-easy .layui-layer-setwin>span { + color: #212529; +} + +.layui-layer-easy .layui-layer-setwin>span:after { color: #212529; } +.layui-layer-easy .layui-layer-setwin .layui-layer-max::after, +.layui-layer-easy .layui-layer-setwin .layui-layer-max::before { + border-color: #212529; +} + +.layui-layer-easy .layui-layer-setwin .layui-layer-min::before { + background-color: #212529; +} + + .layui-layer { @extend .public-border; @@ -264,7 +279,7 @@ $border-line-width:3px; .layui-table-box { @extend .public-border; border-image-outset: 1; - margin-top : 5px; + margin-top: 5px; } .layuimini-container .layui-table-box .layui-table-header th { @@ -291,18 +306,18 @@ $border-line-width:3px; .layui-badge, .layui-badge-rim { - position : relative; + position: relative; border-radius: 0; &::after { - content : ''; - position : absolute; - left : 0; - width : 100%; - height : 100%; - top : 0; + content: ''; + position: absolute; + left: 0; + width: 100%; + height: 100%; + top: 0; pointer-events: none; - box-shadow : 0 4px #209cee, 0 -4px #209cee, 4px 0 #209cee, -4px 0 #209cee; + box-shadow: 0 4px #209cee, 0 -4px #209cee, 4px 0 #209cee, -4px 0 #209cee; } &.layui-bg-blue { diff --git a/public/static/common/css/theme/_win7.scss b/public/static/common/css/theme/_win7.scss index e387e94..e5a089a 100644 --- a/public/static/common/css/theme/_win7.scss +++ b/public/static/common/css/theme/_win7.scss @@ -54,7 +54,7 @@ top: 1px; } -.layui-layer-easy .layui-layer-title~.layui-layer-setwin>a { +.layui-layer-easy .layui-layer-title~.layui-layer-setwin>span { height: 20px !important; line-height: 20px !important; @@ -74,10 +74,6 @@ min-width: 26px; text-align: center; - &::after { - position: relative; - } - &:hover { background: radial-gradient(circle at 50% 100%, #2aceda, transparent 60%), linear-gradient(#a9d2e8 50%, #196c9b 0) !important; } diff --git a/public/static/common/css/theme/index.css b/public/static/common/css/theme/index.css index a036d08..4d240b4 100644 --- a/public/static/common/css/theme/index.css +++ b/public/static/common/css/theme/index.css @@ -1374,6 +1374,7 @@ background: unset !important; color: #212529 !important; font-size: 16px; + border-bottom: 1px solid #f0f0f0; } .elem-style-nes .layui-layer-easy .layui-layer-btn { background: unset !important; @@ -1394,9 +1395,19 @@ .elem-style-nes .layui-layer-dialog .layui-layer-content { font-size: 16px; } -.elem-style-nes .layui-layer-easy .layui-layer-setwin > a:after { +.elem-style-nes .layui-layer-easy .layui-layer-setwin > span { color: #212529; } +.elem-style-nes .layui-layer-easy .layui-layer-setwin > span:after { + color: #212529; +} +.elem-style-nes .layui-layer-easy .layui-layer-setwin .layui-layer-max::after, +.elem-style-nes .layui-layer-easy .layui-layer-setwin .layui-layer-max::before { + border-color: #212529; +} +.elem-style-nes .layui-layer-easy .layui-layer-setwin .layui-layer-min::before { + background-color: #212529; +} .elem-style-nes .layui-card .layui-card-header { font-size: 18px; } @@ -1495,7 +1506,7 @@ height: 27px !important; top: 1px; } -.elem-style-win7 .layui-layer-easy .layui-layer-title ~ .layui-layer-setwin > a { +.elem-style-win7 .layui-layer-easy .layui-layer-title ~ .layui-layer-setwin > span { height: 20px !important; line-height: 20px !important; background: linear-gradient(hsla(0, 0%, 100%, 0.3), hsla(0, 0%, 100%, 0.3) 45%, rgba(0, 0, 0, 0.1) 50%, rgba(0, 0, 0, 0.1) 75%, hsla(0, 0%, 100%, 0.5)) !important; @@ -1511,24 +1522,21 @@ min-width: 26px; text-align: center; } -.elem-style-win7 .layui-layer-easy .layui-layer-title ~ .layui-layer-setwin > a::after { - position: relative; -} -.elem-style-win7 .layui-layer-easy .layui-layer-title ~ .layui-layer-setwin > a:hover { +.elem-style-win7 .layui-layer-easy .layui-layer-title ~ .layui-layer-setwin > span:hover { background: radial-gradient(circle at 50% 100%, #2aceda, transparent 60%), linear-gradient(#a9d2e8 50%, #196c9b 0) !important; } -.elem-style-win7 .layui-layer-easy .layui-layer-title ~ .layui-layer-setwin > a:last-child { +.elem-style-win7 .layui-layer-easy .layui-layer-title ~ .layui-layer-setwin > span:last-child { border: 0; border-bottom-right-radius: 5px; } -.elem-style-win7 .layui-layer-easy .layui-layer-title ~ .layui-layer-setwin > a:first-child { +.elem-style-win7 .layui-layer-easy .layui-layer-title ~ .layui-layer-setwin > span:first-child { border-bottom-left-radius: 5px; } -.elem-style-win7 .layui-layer-easy .layui-layer-title ~ .layui-layer-setwin > a.layui-layer-close1 { +.elem-style-win7 .layui-layer-easy .layui-layer-title ~ .layui-layer-setwin > span.layui-layer-close1 { background-color: #d04a37 !important; min-width: 45px !important; } -.elem-style-win7 .layui-layer-easy .layui-layer-title ~ .layui-layer-setwin > a.layui-layer-close1:hover { +.elem-style-win7 .layui-layer-easy .layui-layer-title ~ .layui-layer-setwin > span.layui-layer-close1:hover { filter: contrast(1.3); background-image: linear-gradient(hsla(0, 0%, 100%, 0.3), hsla(0, 0%, 100%, 0.3) 45%, rgba(0, 0, 0, 0.1) 50%, rgba(0, 0, 0, 0.1) 75%, hsla(0, 0%, 100%, 0.5)) !important; }