From b77a2802bf7095557452964028566b35b319ac12 Mon Sep 17 00:00:00 2001 From: yinxr <2273460044@qq.com> Date: Mon, 28 Jan 2019 14:01:04 +0800 Subject: [PATCH] Signed-off-by: yinxr <2273460044@qq.com> --- src/main/webapp/WEB-INF/manager/index.ftl | 2 +- .../static/ms-admin/4.7.0/css/index.css | 27 ++++++- .../static/ms-admin/4.7.0/css/login.css | 49 +++++++++++- .../static/ms-admin/4.7.0/less/index.less | 3 + .../static/ms-admin/4.7.0/less/login.less | 2 +- src/main/webapp/static/mweixin/article.less | 30 +++---- .../webapp/static/mweixin/css/article.css | 35 +++++--- .../static/mweixin/css/message-reply.css | 49 ++++++++---- .../webapp/static/mweixin/message-reply.less | 80 ++++++++++--------- 9 files changed, 194 insertions(+), 83 deletions(-) diff --git a/src/main/webapp/WEB-INF/manager/index.ftl b/src/main/webapp/WEB-INF/manager/index.ftl index 0255dec4..bffcf4ad 100644 --- a/src/main/webapp/WEB-INF/manager/index.ftl +++ b/src/main/webapp/WEB-INF/manager/index.ftl @@ -11,7 +11,7 @@ -
+
diff --git a/src/main/webapp/static/ms-admin/4.7.0/css/index.css b/src/main/webapp/static/ms-admin/4.7.0/css/index.css index 9015d13a..ad738bb5 100644 --- a/src/main/webapp/static/ms-admin/4.7.0/css/index.css +++ b/src/main/webapp/static/ms-admin/4.7.0/css/index.css @@ -22,8 +22,10 @@ html, body { min-height: 100vh; + width: 100vw; background-color: #eee; margin: 0; + display: flex; font-weight: initial !important; font-size: 14px !important; color: #333 !important; @@ -48,7 +50,7 @@ input::-webkit-input-placeholder, textarea::-webkit-input-placeholder { font-weight: initial; font-size: 12px; - color: #999; + color: #aaa; resize: none; } *::-webkit-scrollbar { @@ -71,7 +73,7 @@ textarea::-webkit-input-placeholder { } .ms-container { margin: 12px; - height: 100%; + height: calc(100% - 24px); padding: 14px 14px 0 14px; background: #fff; } @@ -95,6 +97,27 @@ textarea::-webkit-input-placeholder { .el-button + .el-button { margin-left: 0; } +.ms-weixin-content { + width: calc(100% - 140px); +} +.ms-weixin-dialog .el-dialog__header { + height: 55px; + box-sizing: border-box; + padding: 10px 10px 25px 10px; + border-bottom: 1px solid #ddd; +} +.ms-weixin-dialog .el-dialog__header .el-dialog__title { + font-weight: bold; + font-size: 14px; + color: #333; +} +.ms-weixin-dialog .el-dialog__footer { + border-top: 1px solid #ddd; + padding: 15px !important; +} +.index { + width: 100%; +} .ms-admin-header { display: flex; padding: 0; diff --git a/src/main/webapp/static/ms-admin/4.7.0/css/login.css b/src/main/webapp/static/ms-admin/4.7.0/css/login.css index 27c28686..1854d3b3 100644 --- a/src/main/webapp/static/ms-admin/4.7.0/css/login.css +++ b/src/main/webapp/static/ms-admin/4.7.0/css/login.css @@ -22,8 +22,10 @@ html, body { min-height: 100vh; + width: 100vw; background-color: #eee; margin: 0; + display: flex; font-weight: initial !important; font-size: 14px !important; color: #333 !important; @@ -48,7 +50,7 @@ input::-webkit-input-placeholder, textarea::-webkit-input-placeholder { font-weight: initial; font-size: 12px; - color: #999; + color: #aaa; resize: none; } *::-webkit-scrollbar { @@ -69,7 +71,52 @@ textarea::-webkit-input-placeholder { background-color: #ddd; /*滚动条的背景颜色*/ } +.ms-container { + margin: 12px; + height: calc(100% - 24px); + padding: 14px 14px 0 14px; + background: #fff; +} +.ms-header { + padding: 10px; + margin: 0; + border-bottom: 1px solid #ddd; + background: #fff; + height: 50px; +} +.ms-pagination { + padding: 20px 0; + text-align: right; +} +.ms-fr { + float: right; +} +.ms-tr { + text-align: right; +} +.el-button + .el-button { + margin-left: 0; +} +.ms-weixin-content { + width: calc(100% - 140px); +} +.ms-weixin-dialog .el-dialog__header { + height: 55px; + box-sizing: border-box; + padding: 10px 10px 25px 10px; + border-bottom: 1px solid #ddd; +} +.ms-weixin-dialog .el-dialog__header .el-dialog__title { + font-weight: bold; + font-size: 14px; + color: #333; +} +.ms-weixin-dialog .el-dialog__footer { + border-top: 1px solid #ddd; + padding: 15px !important; +} .login { + width: 100vw; height: 100vh; } .login .ms-admin-login-container { diff --git a/src/main/webapp/static/ms-admin/4.7.0/less/index.less b/src/main/webapp/static/ms-admin/4.7.0/less/index.less index 01156738..ccaadb6f 100644 --- a/src/main/webapp/static/ms-admin/4.7.0/less/index.less +++ b/src/main/webapp/static/ms-admin/4.7.0/less/index.less @@ -1,5 +1,8 @@ @import "app.less"; //头部 +.index{ + width: 100%; +} .ms-admin-header { display: flex; padding: 0; diff --git a/src/main/webapp/static/ms-admin/4.7.0/less/login.less b/src/main/webapp/static/ms-admin/4.7.0/less/login.less index 23728b82..ad4bbf99 100644 --- a/src/main/webapp/static/ms-admin/4.7.0/less/login.less +++ b/src/main/webapp/static/ms-admin/4.7.0/less/login.less @@ -1,7 +1,7 @@ @import "app.less"; // 登录 .login{ - height: 100vh; + .ms-width-height(100vw,100vh); .ms-admin-login-container{ height: 100%; background: url('../images/login-bg.jpg') center no-repeat; diff --git a/src/main/webapp/static/mweixin/article.less b/src/main/webapp/static/mweixin/article.less index dd969daf..e649a217 100644 --- a/src/main/webapp/static/mweixin/article.less +++ b/src/main/webapp/static/mweixin/article.less @@ -4,6 +4,7 @@ .ms-flex(); width: 100%; background: transparent !important; + padding: 0 !important; .el-container { // 侧边 .el-aside { @@ -115,22 +116,23 @@ .ms-main-body { height: calc(~'100% - 180px'); background: #fff; - .edui-editor { - height: 100%; - .edui-editor-toolbarboxouter { - background-color: none !important; - background-image: none !important; - } // 编辑器样式 + .edui-default{ .edui-editor { - border: none !important; - .edui-editor-toolbarbox { - box-shadow: none !important; - .edui-editor-toolbarboxouter { - background-color: transparent !important; - background-image: none !important; - border: none !important; - border-radius: 0 !important; + .edui-editor-toolbarboxouter { + background-color: none !important; + background-image: none !important; + } // 编辑器样式 + .edui-editor { + border: none !important; + .edui-editor-toolbarbox { box-shadow: none !important; + .edui-editor-toolbarboxouter { + background-color: transparent !important; + background-image: none !important; + border: none !important; + border-radius: 0 !important; + box-shadow: none !important; + } } } } diff --git a/src/main/webapp/static/mweixin/css/article.css b/src/main/webapp/static/mweixin/css/article.css index ad5c1f1d..c5187d4c 100644 --- a/src/main/webapp/static/mweixin/css/article.css +++ b/src/main/webapp/static/mweixin/css/article.css @@ -50,7 +50,7 @@ input::-webkit-input-placeholder, textarea::-webkit-input-placeholder { font-weight: initial; font-size: 12px; - color: #999; + color: #aaa; resize: none; } *::-webkit-scrollbar { @@ -100,11 +100,27 @@ textarea::-webkit-input-placeholder { .ms-weixin-content { width: calc(100% - 140px); } +.ms-weixin-dialog .el-dialog__header { + height: 55px; + box-sizing: border-box; + padding: 10px 10px 25px 10px; + border-bottom: 1px solid #ddd; +} +.ms-weixin-dialog .el-dialog__header .el-dialog__title { + font-weight: bold; + font-size: 14px; + color: #333; +} +.ms-weixin-dialog .el-dialog__footer { + border-top: 1px solid #ddd; + padding: 15px !important; +} .ms-article { display: flex; justify-content: space-between; width: 100%; background: transparent !important; + padding: 0 !important; } .ms-article .el-container .el-aside { padding: 14px; @@ -180,7 +196,7 @@ textarea::-webkit-input-placeholder { .ms-article .el-container .el-aside .ms-article-footer .el-button span { font-weight: initial; font-size: 12px; - color: #999; + color: #aaa; } .ms-article .el-container .el-main { flex: 1; @@ -216,13 +232,13 @@ textarea::-webkit-input-placeholder { .ms-article .el-container .el-main .ms-main-header .ms-pic-upload .el-upload span { font-weight: initial; font-size: 12px; - color: #999; + color: #aaa; margin-top: 4px; } .ms-article .el-container .el-main .ms-main-header .ms-pic-upload .el-upload i { font-weight: initial; font-size: 18px; - color: #999; + color: #aaa; } .ms-article .el-container .el-main .ms-main-header .el-form { flex: 1; @@ -241,20 +257,17 @@ textarea::-webkit-input-placeholder { height: calc(100% - 180px); background: #fff; } -.ms-article .el-container .el-main .ms-main-body .edui-editor { - height: 100%; -} -.ms-article .el-container .el-main .ms-main-body .edui-editor .edui-editor-toolbarboxouter { +.ms-article .el-container .el-main .ms-main-body .edui-default .edui-editor .edui-editor-toolbarboxouter { background-color: none !important; background-image: none !important; } -.ms-article .el-container .el-main .ms-main-body .edui-editor .edui-editor { +.ms-article .el-container .el-main .ms-main-body .edui-default .edui-editor .edui-editor { border: none !important; } -.ms-article .el-container .el-main .ms-main-body .edui-editor .edui-editor .edui-editor-toolbarbox { +.ms-article .el-container .el-main .ms-main-body .edui-default .edui-editor .edui-editor .edui-editor-toolbarbox { box-shadow: none !important; } -.ms-article .el-container .el-main .ms-main-body .edui-editor .edui-editor .edui-editor-toolbarbox .edui-editor-toolbarboxouter { +.ms-article .el-container .el-main .ms-main-body .edui-default .edui-editor .edui-editor .edui-editor-toolbarbox .edui-editor-toolbarboxouter { background-color: transparent !important; background-image: none !important; border: none !important; diff --git a/src/main/webapp/static/mweixin/css/message-reply.css b/src/main/webapp/static/mweixin/css/message-reply.css index 21270200..05590b86 100644 --- a/src/main/webapp/static/mweixin/css/message-reply.css +++ b/src/main/webapp/static/mweixin/css/message-reply.css @@ -50,7 +50,7 @@ input::-webkit-input-placeholder, textarea::-webkit-input-placeholder { font-weight: initial; font-size: 12px; - color: #999; + color: #aaa; resize: none; } *::-webkit-scrollbar { @@ -100,6 +100,21 @@ textarea::-webkit-input-placeholder { .ms-weixin-content { width: calc(100% - 140px); } +.ms-weixin-dialog .el-dialog__header { + height: 55px; + box-sizing: border-box; + padding: 10px 10px 25px 10px; + border-bottom: 1px solid #ddd; +} +.ms-weixin-dialog .el-dialog__header .el-dialog__title { + font-weight: bold; + font-size: 14px; + color: #333; +} +.ms-weixin-dialog .el-dialog__footer { + border-top: 1px solid #ddd; + padding: 15px !important; +} .ms-message-reply { display: flex; justify-content: flex-start; @@ -112,63 +127,67 @@ textarea::-webkit-input-placeholder { } .ms-message-reply .message-reply-tabs { flex: 1; - border: 1px solid #ddd; border-radius: 4px 4px 0 0 !important; + border: none !important; } .ms-message-reply .message-reply-tabs .el-tabs__header { margin: 0 !important; } .ms-message-reply .message-reply-tabs .el-tabs__header .el-tabs__nav-scroll { padding: 0 20px; + border: 1px solid #ddd; +} +.ms-message-reply .message-reply-tabs .el-tabs__content { + border: 1px solid #ddd; } -.ms-message-reply .message-reply-tabs .el-tab-pane { +.ms-message-reply .message-reply-tabs .el-tabs__content .el-tab-pane { padding: 0 !important; width: 100%; display: flex; justify-content: space-between; } -.ms-message-reply .message-reply-tabs .el-tab-pane > .el-form { +.ms-message-reply .message-reply-tabs .el-tabs__content .el-tab-pane > .el-form { width: 100%; } -.ms-message-reply .message-reply-tabs .el-tab-pane > .el-form .ms-message-reply-content { +.ms-message-reply .message-reply-tabs .el-tabs__content .el-tab-pane > .el-form .ms-message-reply-content { margin: 0; } -.ms-message-reply .message-reply-tabs .el-tab-pane > .el-form .ms-message-reply-content .el-form-item__content { +.ms-message-reply .message-reply-tabs .el-tabs__content .el-tab-pane > .el-form .ms-message-reply-content .el-form-item__content { position: relative; } -.ms-message-reply .message-reply-tabs .el-tab-pane > .el-form .ms-message-reply-content .el-form-item__content .el-icon-delete { +.ms-message-reply .message-reply-tabs .el-tabs__content .el-tab-pane > .el-form .ms-message-reply-content .el-form-item__content .el-icon-delete { position: absolute; right: 5px; bottom: 66px; font-weight: initial; font-size: 12px; - color: #999; + color: #aaa; } -.ms-message-reply .message-reply-tabs .el-tab-pane > .el-form .ms-message-reply-content .el-form-item__content .el-icon-delete:hover { +.ms-message-reply .message-reply-tabs .el-tabs__content .el-tab-pane > .el-form .ms-message-reply-content .el-form-item__content .el-icon-delete:hover { cursor: pointer; } -.ms-message-reply .message-reply-tabs .el-tab-pane > .el-form .ms-message-reply-content .el-form-item__content textarea { +.ms-message-reply .message-reply-tabs .el-tabs__content .el-tab-pane > .el-form .ms-message-reply-content .el-form-item__content textarea { height: 127px !important; border: none !important; border-bottom: 1px solid #ddd !important; } -.ms-message-reply .message-reply-tabs .el-tab-pane > .el-form .ms-message-reply-content .el-form-item__content .footer { +.ms-message-reply .message-reply-tabs .el-tabs__content .el-tab-pane > .el-form .ms-message-reply-content .el-form-item__content .footer { height: 58px; padding: 0 14px; display: flex; justify-content: flex-start; align-items: center; } -.ms-message-reply .message-reply-tabs .el-tab-pane > .el-form .ms-message-reply-content .el-form-item__content .footer i { +.ms-message-reply .message-reply-tabs .el-tabs__content .el-tab-pane > .el-form .ms-message-reply-content .el-form-item__content .footer i { margin-right: 12px; font-size: 16px; } -.ms-message-reply .message-reply-tabs .el-tab-pane > .el-form .ms-message-reply-content .el-form-item__content .footer a { +.ms-message-reply .message-reply-tabs .el-tabs__content .el-tab-pane > .el-form .ms-message-reply-content .el-form-item__content .footer a { font-weight: initial; font-size: 14px; color: #0099ff; } -.ms-message-reply .message-reply-tabs .el-tab-pane > .el-form .ms-message-reply-content .el-form-item__content .footer i:hover, -.ms-message-reply .message-reply-tabs .el-tab-pane > .el-form .ms-message-reply-content .el-form-item__content .footer a:hover { +.ms-message-reply .message-reply-tabs .el-tabs__content .el-tab-pane > .el-form .ms-message-reply-content .el-form-item__content .footer i:hover, +.ms-message-reply .message-reply-tabs .el-tabs__content .el-tab-pane > .el-form .ms-message-reply-content .el-form-item__content .footer a:hover { cursor: pointer; } diff --git a/src/main/webapp/static/mweixin/message-reply.less b/src/main/webapp/static/mweixin/message-reply.less index e72ca08b..048095ae 100644 --- a/src/main/webapp/static/mweixin/message-reply.less +++ b/src/main/webapp/static/mweixin/message-reply.less @@ -11,59 +11,63 @@ // 导航切换 .message-reply-tabs{ flex: 1; - border: 1px solid @borderColor; border-radius:4px 4px 0 0 !important; + border: none !important; .el-tabs__header{ // background: #f2f2f6; margin: 0 !important; .el-tabs__nav-scroll{ padding: 0 20px; + border:1px solid @borderColor; } } - .el-tab-pane{ - padding: 0 !important; - width: 100%; - .ms-flex(); - >.el-form{ + .el-tabs__content{ + border:1px solid @borderColor; + .el-tab-pane{ + padding: 0 !important; width: 100%; - .ms-message-reply-content{ - margin: 0; - .el-form-item__content{ - position: relative; - .el-icon-delete{ - position: absolute; - right: 5px; - bottom: 66px; - .ms-font(@auxiliarySize,@auxiliaryColor); - &:hover{ - cursor: pointer; - } - } - textarea{ - height: 127px !important; - border: none !important; - border-bottom: 1px solid @borderColor !important; - } - .footer{ - height: 58px; - padding: 0 14px; - .ms-flex(flex-start); - align-items: center; - i{ - margin-right: 12px; - font-size: 16px; - } - a{ - .ms-font(@defalutSize,@themeColor); - } - i,a{ + .ms-flex(); + >.el-form{ + width: 100%; + .ms-message-reply-content{ + margin: 0; + .el-form-item__content{ + position: relative; + .el-icon-delete{ + position: absolute; + right: 5px; + bottom: 66px; + .ms-font(@auxiliarySize,@auxiliaryColor); &:hover{ cursor: pointer; } } + textarea{ + height: 127px !important; + border: none !important; + border-bottom: 1px solid @borderColor !important; + } + .footer{ + height: 58px; + padding: 0 14px; + .ms-flex(flex-start); + align-items: center; + i{ + margin-right: 12px; + font-size: 16px; + } + a{ + .ms-font(@defalutSize,@themeColor); + } + i,a{ + &:hover{ + cursor: pointer; + } + } + } } + } - } } }