diff --git a/common/src/main/resources/static/laydate/5.3/theme/default/laydate.css b/common/src/main/resources/static/laydate/5.3/theme/default/laydate.css index dcb175d2..6e802aa2 100644 --- a/common/src/main/resources/static/laydate/5.3/theme/default/laydate.css +++ b/common/src/main/resources/static/laydate/5.3/theme/default/laydate.css @@ -72,7 +72,7 @@ html #layuicss-laydate{display: none; position: absolute; width: 1989px;} .layui-laydate-content{position: relative; padding: 5px; -moz-user-select: none; -webkit-user-select: none; -ms-user-select: none;} .layui-laydate-content table{border-collapse: collapse; border-spacing: 0;} .layui-laydate-content th, -.layui-laydate-content td{width: 36px; height: 30px; padding: 5px; text-align: center;} +.layui-laydate-content td{width: 36px; height: 30px; padding: 5px; text-align: center; border-radius: 4px;} .layui-laydate-content th{font-weight: 400;} .layui-laydate-content td{position: relative; cursor: pointer;} .laydate-day-mark{position: absolute; left: 0; top: 0; width: 100%; line-height: 30px; font-size: 12px; overflow: hidden;} @@ -111,7 +111,7 @@ html #layuicss-laydate{display: none; position: absolute; width: 1989px;} /* 默认简约主题 */ -.layui-laydate, .layui-laydate-hint{border: 1px solid #d2d2d2; box-shadow: 0 2px 4px rgba(0,0,0,.12); background-color: #fff; color: #666;} +.layui-laydate, .layui-laydate-hint{border: 1px solid #d2d2d2; box-shadow: 0 2px 4px rgba(0,0,0,.12); background-color: #fff; color: #666; border-radius: 4px;} .layui-laydate-header{border-bottom: 1px solid #e2e2e2;} .layui-laydate-header i:hover, .layui-laydate-header span:hover{color: #08c;} diff --git a/common/src/main/resources/static/layer/3.5/theme/default/layer.css b/common/src/main/resources/static/layer/3.5/theme/default/layer.css index 3b1d833e..06a2f86a 100644 --- a/common/src/main/resources/static/layer/3.5/theme/default/layer.css +++ b/common/src/main/resources/static/layer/3.5/theme/default/layer.css @@ -3,7 +3,7 @@ html #layuicss-layer{display:none;position:absolute;width:1989px;} .layui-layer-shade, .layui-layer{position:fixed;_position:absolute;pointer-events:auto;} .layui-layer-shade{top:0;left:0;width:100%;height:100%;_height:expression(document.body.offsetHeight+"px");} .layui-layer{-webkit-overflow-scrolling:touch;} -.layui-layer{top:150px;left:0;margin:0;padding:0;background-color:#fff;-webkit-background-clip:content;border-radius:3px;box-shadow:1px 1px 50px rgba(0,0,0,.3);} +.layui-layer{top:150px;left:0;margin:0;padding:0;background-color:#fff;-webkit-background-clip:content;border-radius:8px;box-shadow:1px 1px 50px rgba(0,0,0,.3);} .layui-layer-close{position:absolute;} .layui-layer-content{position:relative;overflow:hidden;} .layui-layer-border{border:1px solid #B2B2B2;border:1px solid rgba(0,0,0,.1);box-shadow:1px 1px 5px rgba(0,0,0,.2);} @@ -35,7 +35,7 @@ html #layuicss-layer{display:none;position:absolute;width:1989px;} @keyframes layer-fadeIn{0%{opacity:0}100%{opacity:1}}.layer-anim-05{-webkit-animation-name:layer-fadeIn;animation-name:layer-fadeIn} @-webkit-keyframes layer-shake{0%,100%{-webkit-transform:translateX(0);transform:translateX(0)}10%,30%,50%,70%,90%{-webkit-transform:translateX(-10px);transform:translateX(-10px)}20%,40%,60%,80%{-webkit-transform:translateX(10px);transform:translateX(10px)}}@keyframes layer-shake{0%,100%{-webkit-transform:translateX(0);-ms-transform:translateX(0);transform:translateX(0)}10%,30%,50%,70%,90%{-webkit-transform:translateX(-10px);-ms-transform:translateX(-10px);transform:translateX(-10px)}20%,40%,60%,80%{-webkit-transform:translateX(10px);-ms-transform:translateX(10px);transform:translateX(10px)}}.layer-anim-06{-webkit-animation-name:layer-shake;animation-name:layer-shake}@-webkit-keyframes fadeIn{0%{opacity:0}100%{opacity:1}} -.layui-layer-title{padding:0 80px 0 20px;height:50px;line-height:50px;border-bottom:1px solid #F0F0F0;font-size:14px;color:#333;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;border-radius:2px 2px 0 0;} +.layui-layer-title{padding:0 80px 0 20px;height:50px;line-height:50px;border-bottom:1px solid #F0F0F0;font-size:14px;color:#333;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;border-radius:8px 8px 0 0;} .layui-layer-setwin{position:absolute;right:20px;*right:0;top:20px;font-size:0;line-height:initial;} .layui-layer-setwin a{position:relative;width:16px;height:16px;margin-left:19px;font-size:12px;_overflow:hidden;} .layui-layer-setwin .layui-layer-min{display:none!important} @@ -51,7 +51,7 @@ html #layuicss-layer{display:none;position:absolute;width:1989px;} .layui-layer-setwin .layui-layer-close2:hover{ background-position:-180px -31px;} .layui-layer-btn{text-align:right;padding:0 15px 12px;pointer-events:auto;user-select:none;-webkit-user-select:none;} -.layui-layer-btn a{height:28px;line-height:28px;margin:5px 5px 0;padding:0 15px;border:1px solid #dedede;background-color:#fff;color:#333;border-radius:3px;font-weight:400;cursor:pointer;text-decoration:none;} +.layui-layer-btn a{height:28px;line-height:28px;margin:5px 5px 0;padding:0 15px;border:1px solid #dedede;background-color:#fff;color:#333;border-radius:8px;font-weight:400;cursor:pointer;text-decoration:none;} .layui-layer-btn a:hover{opacity:0.9;text-decoration:none;} .layui-layer-btn a:active{opacity:0.8;} .layui-layer-btn .layui-layer-btn0{border-color:#1E9FFF;background-color:#1E9FFF;color:#fff;} @@ -75,14 +75,14 @@ html #layuicss-layer{display:none;position:absolute;width:1989px;} .layui-layer-page .layui-layer-content{position:relative;overflow:auto;} .layui-layer-page .layui-layer-btn,.layui-layer-iframe .layui-layer-btn{padding-top:10px;} .layui-layer-nobg{background:none;} -.layui-layer-iframe iframe{display:block;width:100%;border-radius:3px;} +.layui-layer-iframe iframe{display:block;width:100%;border-radius:8px;} .layui-layer-loading{border-radius:100%;background:none; box-shadow:none; border:none;} .layui-layer-loading .layui-layer-content{width:60px;height:24px;background:url(loading-0.gif) no-repeat;} .layui-layer-loading .layui-layer-loading1{width:37px;height:37px;background:url(loading-1.gif) no-repeat;} .layui-layer-loading .layui-layer-loading2, .layui-layer-ico16{width:32px;height:32px;background:url(loading-2.gif) no-repeat;} .layui-layer-tips{background:none;box-shadow:none;border:none;} -.layui-layer-tips .layui-layer-content{position:relative;overflow:visible;line-height:22px;min-width:12px;padding:8px 15px;font-size:12px;_float:left;border-radius:3px;box-shadow:1px 1px 3px rgba(0,0,0,.2);background-color:#000;color:#fff;} +.layui-layer-tips .layui-layer-content{position:relative;overflow:visible;line-height:22px;min-width:12px;padding:8px 15px;font-size:12px;_float:left;border-radius:8px;box-shadow:1px 1px 3px rgba(0,0,0,.2);background-color:#000;color:#fff;} .layui-layer-tips .layui-layer-close{right:-2px;top:-1px;} .layui-layer-tips i.layui-layer-TipsG{ position:absolute; width:0;height:0;border-width:8px;border-color:transparent;border-style:dashed;*overflow:hidden;} .layui-layer-tips i.layui-layer-TipsT, .layui-layer-tips i.layui-layer-TipsB{left:5px;border-right-style:solid;border-right-color:#000;} @@ -148,7 +148,7 @@ html #layuicss-layer{display:none;position:absolute;width:1989px;} .layui-layer-page .layui-layer-content .form-file{padding-top:4px;} .layui-layer-page .layui-layer-btn, .layui-layer-iframe .layui-layer-btn {padding-top:3px;padding-bottom:10px;} .layui-layer-btn .layui-layer-btn0{border-color:#1e5edb;background-color:#1e5edb;} -.layui-layer-btn a {height:auto;padding:1px 14px;font-size:14px;background-color:#f4f4f4;} +.layui-layer-btn a {height:auto;padding:1px 12px;margin-right:4px;font-size:14px;background-color:#f4f4f4;} .layui-layer.toast-top-full-width {min-width:60%;} .skin-dark .layui-layer {background:#1a1a1a;color:#ddd;} diff --git a/modules/core/src/main/resources/static/ueditor/1.4/themes/simple/css/ueditor.css b/modules/core/src/main/resources/static/ueditor/1.4/themes/simple/css/ueditor.css index 0753c417..26ce1515 100644 --- a/modules/core/src/main/resources/static/ueditor/1.4/themes/simple/css/ueditor.css +++ b/modules/core/src/main/resources/static/ueditor/1.4/themes/simple/css/ueditor.css @@ -167,7 +167,7 @@ div.edui-box { overflow: visible; -webkit-border-radius: 4px; -moz-border-radius: 4px; - border-radius: 4px; + border-radius: 6px; } .edui-editor div{ width:auto; @@ -285,7 +285,7 @@ div.edui-box { color: #666; background-color: #FFF; padding: 10px; - border-radius: 5px; + /*border-radius: 5px;*/ } .edui-simple .edui-bubble .edui-shadow { @@ -2126,3 +2126,15 @@ div.edui-box { .edui-outline .sectionItem{cursor:pointer;padding:4px;} .edui-outline .sectionItem:hover{color:#f00;} .edui-outline .fixTop{position:fixed!important;top:-3px;} + +.skin-dark .edui-simple .edui-editor, +.skin-dark .edui-simple .edui-editor-toolbarboxouter, +.skin-dark .edui-simple .edui-toolbar .edui-combox .edui-combox-body, +.skin-dark .edui-simple .edui-popup-content {background: #1a1a1a;border-color:#414141;color:#ddd;} +.skin-dark .edui-simple .edui-toolbar .edui-button .edui-state-hover .edui-button-wrap, +.skin-dark .edui-simple .edui-toolbar .edui-splitbutton .edui-state-hover .edui-splitbutton-body, +.skin-dark .edui-simple .edui-toolbar .edui-menubutton .edui-state-hover .edui-menubutton-body, +.skin-dark .edui-simple .edui-toolbar .edui-splitbutton .edui-state-opened .edui-splitbutton-body, +.skin-dark .edui-simple .edui-toolbar .edui-menubutton .edui-state-opened .edui-menubutton-body, +.skin-dark .edui-simple .edui-toolbar .edui-button .edui-state-checked .edui-button-wrap, +.skin-dark .edui-simple .edui-list .edui-state-hover {background:#4b4a4a;border-color:#414141;color:#ddd;} diff --git a/modules/core/src/main/resources/views/modules/sys/companyIndex.html b/modules/core/src/main/resources/views/modules/sys/companyIndex.html index 03e1509a..71883766 100644 --- a/modules/core/src/main/resources/views/modules/sys/companyIndex.html +++ b/modules/core/src/main/resources/views/modules/sys/companyIndex.html @@ -27,7 +27,7 @@ // 初始化布局 $('body').layout({ west__initClosed: $(window).width() <= 767, // 是否默认关闭 - west__size: 200 + west__size: 220 }); // 主页框架 var win = $("#mainFrame")[0].contentWindow;