From 352235a1cf3b147e7e9108604bba396c35b7bf0f Mon Sep 17 00:00:00 2001 From: a123456 <1209165801@qq.com> Date: Mon, 28 Jan 2019 19:13:23 +0800 Subject: [PATCH] Signed-off-by: a123456 <1209165801@qq.com> --- src/main/webapp/WEB-INF/manager/login.ftl | 210 +++++++++-------- .../WEB-INF/manager/mweixin/article/index.ftl | 143 ------------ .../WEB-INF/manager/mweixin/keyword/form.ftl | 81 ++++--- .../WEB-INF/manager/mweixin/keyword/index.ftl | 45 ++-- .../webapp/WEB-INF/manager/mweixin/menu.ftl | 5 +- .../WEB-INF/manager/mweixin/menu/index.ftl | 105 +++++---- .../WEB-INF/manager/mweixin/message/index.ftl | 60 +++-- .../WEB-INF/manager/mweixin/metarial/form.ftl | 155 ++++++++++++ .../manager/mweixin/metarial/index.ftl | 6 +- .../WEB-INF/manager/mweixin/picture/index.ftl | 52 +++-- .../webapp/WEB-INF/manager/mweixin/weixin.ftl | 2 +- .../static/ms-admin/4.7.0/css/login.css | 3 - .../static/ms-admin/4.7.0/less/app.less | 21 +- .../static/ms-admin/4.7.0/less/css/login.css | 221 ++++++++++++++++++ .../static/ms-admin/4.7.0/less/login.less | 4 +- src/main/webapp/static/mweixin/article.less | 13 +- .../webapp/static/mweixin/css/article.css | 29 ++- .../webapp/static/mweixin/css/custom-menu.css | 38 ++- .../static/mweixin/css/keyword-list.css | 34 ++- .../static/mweixin/css/keyword-reply.css | 35 ++- .../static/mweixin/css/material-bank-form.css | 18 +- .../static/mweixin/css/material-list.css | 42 +++- src/main/webapp/static/mweixin/css/menu.css | 37 ++- .../static/mweixin/css/message-reply.css | 38 ++- .../static/mweixin/css/new-pic-form.css | 20 +- .../static/mweixin/css/picture-list.css | 96 +++++++- .../webapp/static/mweixin/custom-menu.less | 139 +++++------ .../webapp/static/mweixin/keyword-list.less | 6 +- .../webapp/static/mweixin/keyword-reply.less | 18 +- .../static/mweixin/material-bank-form.less | 2 +- .../webapp/static/mweixin/material-list.less | 5 +- src/main/webapp/static/mweixin/menu.less | 4 + .../webapp/static/mweixin/message-reply.less | 69 +++--- .../webapp/static/mweixin/new-pic-form.less | 2 +- .../webapp/static/mweixin/picture-list.less | 92 ++++++-- 35 files changed, 1242 insertions(+), 608 deletions(-) delete mode 100644 src/main/webapp/WEB-INF/manager/mweixin/article/index.ftl create mode 100644 src/main/webapp/WEB-INF/manager/mweixin/metarial/form.ftl create mode 100644 src/main/webapp/static/ms-admin/4.7.0/less/css/login.css diff --git a/src/main/webapp/WEB-INF/manager/login.ftl b/src/main/webapp/WEB-INF/manager/login.ftl index 83af8897..ab1e5acf 100644 --- a/src/main/webapp/WEB-INF/manager/login.ftl +++ b/src/main/webapp/WEB-INF/manager/login.ftl @@ -1,128 +1,132 @@ - - - - - - - - + + + + - -
- + + + + + + - + +
+ \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/manager/mweixin/article/index.ftl b/src/main/webapp/WEB-INF/manager/mweixin/article/index.ftl deleted file mode 100644 index 74981156..00000000 --- a/src/main/webapp/WEB-INF/manager/mweixin/article/index.ftl +++ /dev/null @@ -1,143 +0,0 @@ - - -
- - -
- -
- -
- -
-

- -
- -
- 添加图文 -
- - -
- - - - 添加封面 - - - - - - - - - - - - - - - - - - -
-
- - -
- - -
- \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/manager/mweixin/keyword/form.ftl b/src/main/webapp/WEB-INF/manager/mweixin/keyword/form.ftl index 19a72df3..b4f46e4f 100644 --- a/src/main/webapp/WEB-INF/manager/mweixin/keyword/form.ftl +++ b/src/main/webapp/WEB-INF/manager/mweixin/keyword/form.ftl @@ -1,42 +1,53 @@ -
- - - - - - - - - - - - - - - +
+ + + + 返回 + 重置 + 保存 - - - - - - - -
- - 插入超链接 -
- - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + 插入超链接 +
+ + + + + + + + + +
+
+ + + + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/manager/mweixin/metarial/index.ftl b/src/main/webapp/WEB-INF/manager/mweixin/metarial/index.ftl index 340105c7..5082bdd1 100644 --- a/src/main/webapp/WEB-INF/manager/mweixin/metarial/index.ftl +++ b/src/main/webapp/WEB-INF/manager/mweixin/metarial/index.ftl @@ -3,9 +3,9 @@
- + - 添加 + 添加 刷新 同步微信素材 @@ -36,7 +36,7 @@

- +
diff --git a/src/main/webapp/WEB-INF/manager/mweixin/picture/index.ftl b/src/main/webapp/WEB-INF/manager/mweixin/picture/index.ftl index 79c00986..5cddee4b 100644 --- a/src/main/webapp/WEB-INF/manager/mweixin/picture/index.ftl +++ b/src/main/webapp/WEB-INF/manager/mweixin/picture/index.ftl @@ -1,9 +1,9 @@
- + - + 添加 刷新 @@ -25,22 +25,42 @@ -
-
- + + +
+
+ +
+ + +
+
+
+ + + + + +
+
+ + + 全部图片（6） +
+ 小米（1） + + +
- - + 小米（1） + +
-
-
- - - - - -
-
+

+ 新建分组

+ + + diff --git a/src/main/webapp/WEB-INF/manager/mweixin/weixin.ftl b/src/main/webapp/WEB-INF/manager/mweixin/weixin.ftl index 58ba5ed0..594e13a9 100644 --- a/src/main/webapp/WEB-INF/manager/mweixin/weixin.ftl +++ b/src/main/webapp/WEB-INF/manager/mweixin/weixin.ftl @@ -9,6 +9,7 @@ + @@ -16,6 +17,5 @@ - \ No newline at end of file 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 1854d3b3..b019c2cc 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 @@ -94,9 +94,6 @@ textarea::-webkit-input-placeholder { .ms-tr { text-align: right; } -.el-button + .el-button { - margin-left: 0; -} .ms-weixin-content { width: calc(100% - 140px); } diff --git a/src/main/webapp/static/ms-admin/4.7.0/less/app.less b/src/main/webapp/static/ms-admin/4.7.0/less/app.less index 77249b0f..17d11cff 100644 --- a/src/main/webapp/static/ms-admin/4.7.0/less/app.less +++ b/src/main/webapp/static/ms-admin/4.7.0/less/app.less @@ -65,7 +65,7 @@ textarea::-webkit-input-placeholder { .ms-container { margin: 12px; height: ~'calc(100% - 24px)'; - padding: 14px 14px 0 14px; + padding: 14px; background: #fff; } @@ -74,7 +74,10 @@ textarea::-webkit-input-placeholder { margin: 0; border-bottom: 1px solid #ddd; background: #fff; - height: 50px + height: 50px; + button{ + height: 30px; + } } .ms-pagination { @@ -91,7 +94,7 @@ textarea::-webkit-input-placeholder { } .el-button+.el-button { - margin-left: 0 +// margin-left: 0 } .ms-weixin-content{ @@ -113,4 +116,14 @@ textarea::-webkit-input-placeholder { border-top: 1px solid @borderColor; padding: 15px !important; } -} \ No newline at end of file +} + +//选中样式 +.ms-hover{ + cursor: pointer; + &:hover{ + color: @themeColor; + background: #fff; + border-color: @themeColor; + } +} diff --git a/src/main/webapp/static/ms-admin/4.7.0/less/css/login.css b/src/main/webapp/static/ms-admin/4.7.0/less/css/login.css new file mode 100644 index 00000000..5594d3f2 --- /dev/null +++ b/src/main/webapp/static/ms-admin/4.7.0/less/css/login.css @@ -0,0 +1,221 @@ +/* +*这里的值严格按照UI设计图标注值来进行设置 +*/ +/* +*颜色 +*/ +/* +*页面的边距 +*/ +/* +*字体 +*/ +/* +*头像 +*/ +/* + * 按钮 + */ +/* +*对常见的多行样式进行了方法封装，方便调用，加快开发效率 +*/ +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; +} +html *, +body * { + text-decoration: none !important; + font-family: Verdana, Arial, Helvetica, sans-serif; + box-sizing: border-box; +} +.ms-ellipsis { + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + display: block; +} +.ms-align-center { + display: flex; + align-items: center; +} +input::-webkit-input-placeholder, +textarea::-webkit-input-placeholder { + font-weight: initial; + font-size: 12px; + color: #aaa; + resize: none; +} +*::-webkit-scrollbar { + width: 8px; + height: 8px; +} +/*定义滚动条轨道 内阴影+圆角*/ +*::-webkit-scrollbar-track { + border-radius: 10px; + /*滚动条的背景区域的圆角*/ + background-color: #eee; + /*滚动条的背景颜色*/ +} +/*定义滑块 内阴影+圆角*/ +*::-webkit-scrollbar-thumb { + border-radius: 10px; + /*滚动条的圆角*/ + background-color: #ddd; + /*滚动条的背景颜色*/ +} +.ms-container { + margin: 12px; + height: calc(100% - 24px); + padding: 14px; + background: #fff; +} +.ms-header { + padding: 10px; + margin: 0; + border-bottom: 1px solid #ddd; + background: #fff; + height: 50px; +} +.ms-header button { + height: 30px; +} +.ms-pagination { + padding: 20px 0; + text-align: right; +} +.ms-fr { + float: right; +} +.ms-tr { + text-align: right; +} +.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-hover { + cursor: pointer; +} +.ms-hover:hover { + color: #0099ff; + background: #fff; + border-color: #0099ff; +} +.login { + width: 100vw; + height: 100vh; +} +.login .ms-admin-login-container { + height: 100%; + background: url('../images/login-bg.jpg') center no-repeat; + background-size: cover; +} +.login .ms-admin-login-container .ms-admin-login-main { + display: flex; + justify-content: center; + align-items: center; +} +.login .ms-admin-login-container .ms-admin-login-main .ms-admin-login-warp { + display: flex; + justify-content: center; + align-items: center; + width: 680px; + height: 320px; +} +.login .ms-admin-login-container .ms-admin-login-main .ms-admin-login-warp > img { + flex: 1; + display: inline-block; +} +.login .ms-admin-login-container .ms-admin-login-main .ms-admin-login-warp .ms-admin-login-form { + flex: 1; + height: 320px; + background: #fff; + padding: 39px 54px; +} +.login .ms-admin-login-container .ms-admin-login-main .ms-admin-login-warp .ms-admin-login-form h1 { + line-height: 1; + font-weight: initial; + font-size: 12px; + color: #999999; + margin: 0 0 30px 0; +} +.login .ms-admin-login-container .ms-admin-login-main .ms-admin-login-warp .ms-admin-login-form h1 span { + font-weight: initial; + font-size: 16px; + color: #0099ff; +} +.login .ms-admin-login-container .ms-admin-login-main .ms-admin-login-warp .ms-admin-login-form .ms-admin-form-item { + margin-bottom: 12px; +} +.login .ms-admin-login-container .ms-admin-login-main .ms-admin-login-warp .ms-admin-login-form .ms-admin-form-item > div { + margin-left: 0 !important; +} +.login .ms-admin-login-container .ms-admin-login-main .ms-admin-login-warp .ms-admin-login-form .ms-admin-form-item .el-form-item__content, +.login .ms-admin-login-container .ms-admin-login-main .ms-admin-login-warp .ms-admin-login-form .ms-admin-form-item .el-input, +.login .ms-admin-login-container .ms-admin-login-main .ms-admin-login-warp .ms-admin-login-form .ms-admin-form-item input { + height: 34px !important; + line-height: 34px !important; +} +.login .ms-admin-login-container .ms-admin-login-main .ms-admin-login-warp .ms-admin-login-form .ms-admin-form-item-code .el-form-item__content { + display: flex; + justify-content: space-between; +} +.login .ms-admin-login-container .ms-admin-login-main .ms-admin-login-warp .ms-admin-login-form .ms-admin-form-item-code .el-form-item__content .el-input__inner, +.login .ms-admin-login-container .ms-admin-login-main .ms-admin-login-warp .ms-admin-login-form .ms-admin-form-item-code .el-form-item__content .el-input { + width: 110px; +} +.login .ms-admin-login-container .ms-admin-login-main .ms-admin-login-warp .ms-admin-login-form .ms-admin-form-item-code .el-form-item__content > img { + width: 66px; + height: 34px; + margin: 0 6px; +} +.login .ms-admin-login-container .ms-admin-login-main .ms-admin-login-warp .ms-admin-login-form .ms-admin-form-item-code .el-form-item__content p { + display: flex; + justify-content: space-between; + line-height: 1; + flex-direction: column; + margin: 0; +} +.login .ms-admin-login-container .ms-admin-login-main .ms-admin-login-warp .ms-admin-login-form .ms-admin-form-item-code .el-form-item__content p span:nth-of-type(1) { + font-weight: initial; + font-size: 10px; + color: #999999; +} +.login .ms-admin-login-container .ms-admin-login-main .ms-admin-login-warp .ms-admin-login-form .ms-admin-form-item-code .el-form-item__content p span:nth-of-type(2) { + font-weight: initial; + font-size: 10px; + color: #0099ff; +} +.login .ms-admin-login-container .ms-admin-login-main .ms-admin-login-warp .ms-admin-login-form .ms-admin-form-item-checkout .el-form-item__content, +.login .ms-admin-login-container .ms-admin-login-main .ms-admin-login-warp .ms-admin-login-form .ms-admin-form-item-checkout .el-input, +.login .ms-admin-login-container .ms-admin-login-main .ms-admin-login-warp .ms-admin-login-form .ms-admin-form-item-checkout input { + height: auto !important; + line-height: 1px !important; +} +.login .ms-admin-login-container .ms-admin-login-main .ms-admin-login-warp .ms-admin-login-form .ms-admin-login-btn { + width: 100%; + height: 34px; + line-height: 5px; +} 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 ad4bbf99..2f2ae4e5 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 @@ -2,10 +2,10 @@ // 登录 .login{ .ms-width-height(100vw,100vh); - .ms-admin-login-container{ + .ms-admin-login-container{ height: 100%; background: url('../images/login-bg.jpg') center no-repeat; - background-size:cover; + background-size:cover; .ms-admin-login-main{ .ms-flex(center); align-items: center; diff --git a/src/main/webapp/static/mweixin/article.less b/src/main/webapp/static/mweixin/article.less index e649a217..9edee892 100644 --- a/src/main/webapp/static/mweixin/article.less +++ b/src/main/webapp/static/mweixin/article.less @@ -6,11 +6,15 @@ background: transparent !important; padding: 0 !important; .el-container { + .ms-container { + padding: 0; + background: transparent; + align-items: flex-start; + } // 侧边 .el-aside { padding: 14px; - background: #fff; - height: 475px; + background: #fff; // 主文章 .ms-main-article { position: relative; @@ -45,7 +49,7 @@ span { width: 100%; display: inline-block; - .ms-ellipsis-clamp(1); + .ms-ellipsis-clamp(2); } } img { @@ -116,7 +120,8 @@ .ms-main-body { height: calc(~'100% - 180px'); background: #fff; - .edui-default{ + .edui-default { + border: none; .edui-editor { .edui-editor-toolbarboxouter { background-color: none !important; diff --git a/src/main/webapp/static/mweixin/css/article.css b/src/main/webapp/static/mweixin/css/article.css index c5187d4c..c5f1d7e6 100644 --- a/src/main/webapp/static/mweixin/css/article.css +++ b/src/main/webapp/static/mweixin/css/article.css @@ -74,7 +74,7 @@ textarea::-webkit-input-placeholder { .ms-container { margin: 12px; height: calc(100% - 24px); - padding: 14px 14px 0 14px; + padding: 14px; background: #fff; } .ms-header { @@ -84,6 +84,9 @@ textarea::-webkit-input-placeholder { background: #fff; height: 50px; } +.ms-header button { + height: 30px; +} .ms-pagination { padding: 20px 0; text-align: right; @@ -94,9 +97,6 @@ textarea::-webkit-input-placeholder { .ms-tr { text-align: right; } -.el-button + .el-button { - margin-left: 0; -} .ms-weixin-content { width: calc(100% - 140px); } @@ -115,6 +115,14 @@ textarea::-webkit-input-placeholder { border-top: 1px solid #ddd; padding: 15px !important; } +.ms-hover { + cursor: pointer; +} +.ms-hover:hover { + color: #0099ff; + background: #fff; + border-color: #0099ff; +} .ms-article { display: flex; justify-content: space-between; @@ -122,10 +130,14 @@ textarea::-webkit-input-placeholder { background: transparent !important; padding: 0 !important; } +.ms-article .el-container .ms-container { + padding: 0; + background: transparent; + align-items: flex-start; +} .ms-article .el-container .el-aside { padding: 14px; background: #fff; - height: 475px; } .ms-article .el-container .el-aside .ms-main-article { position: relative; @@ -136,7 +148,7 @@ textarea::-webkit-input-placeholder { } .ms-article .el-container .el-aside .ms-main-article .ms-main-article-mask { background: #000; - opacity: .2; + opacity: 0.2; width: 100%; height: 146px; position: absolute; @@ -174,7 +186,7 @@ textarea::-webkit-input-placeholder { overflow: hidden; text-overflow: ellipsis; display: -webkit-box; - -webkit-line-clamp: 1; + -webkit-line-clamp: 2; -webkit-box-orient: vertical; } .ms-article .el-container .el-aside .ms-article-item img { @@ -257,6 +269,9 @@ textarea::-webkit-input-placeholder { height: calc(100% - 180px); background: #fff; } +.ms-article .el-container .el-main .ms-main-body .edui-default { + border: none; +} .ms-article .el-container .el-main .ms-main-body .edui-default .edui-editor .edui-editor-toolbarboxouter { background-color: none !important; background-image: none !important; diff --git a/src/main/webapp/static/mweixin/css/custom-menu.css b/src/main/webapp/static/mweixin/css/custom-menu.css index ac443c50..9b8c1151 100644 --- a/src/main/webapp/static/mweixin/css/custom-menu.css +++ b/src/main/webapp/static/mweixin/css/custom-menu.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 { @@ -84,6 +84,9 @@ textarea::-webkit-input-placeholder { background: #fff; height: 50px; } +.ms-header button { + height: 30px; +} .ms-pagination { padding: 20px 0; text-align: right; @@ -94,20 +97,43 @@ textarea::-webkit-input-placeholder { .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; +} +.ms-hover { + cursor: pointer; +} +.ms-hover:hover { + color: #0099ff; + background: #fff; + border-color: #0099ff; +} .ms-custom-menu { color: #f2f2f6; } .ms-custom-menu .ms-custom-container { - margin: 10px; display: flex; justify-content: space-between; } +.ms-custom-menu .ms-custom-container > .ms-container { + padding: 0; + background: transparent; +} .ms-custom-menu .ms-custom-container .el-aside { background: #fff; width: 280px !important; @@ -204,7 +230,7 @@ textarea::-webkit-input-placeholder { margin-left: 10px; font-weight: initial; font-size: 12px; - color: #999; + color: #aaa; } .ms-custom-menu .ms-custom-container .el-main .custom-menu-card .ms-custom-menu-content .el-tabs { border: 1px solid #ddd; diff --git a/src/main/webapp/static/mweixin/css/keyword-list.css b/src/main/webapp/static/mweixin/css/keyword-list.css index b883020a..a3cc0281 100644 --- a/src/main/webapp/static/mweixin/css/keyword-list.css +++ b/src/main/webapp/static/mweixin/css/keyword-list.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 { @@ -74,7 +74,7 @@ textarea::-webkit-input-placeholder { .ms-container { margin: 12px; height: calc(100% - 24px); - padding: 14px 14px 0 14px; + padding: 14px; background: #fff; } .ms-header { @@ -84,6 +84,9 @@ textarea::-webkit-input-placeholder { background: #fff; height: 50px; } +.ms-header button { + height: 30px; +} .ms-pagination { padding: 20px 0; text-align: right; @@ -94,12 +97,29 @@ textarea::-webkit-input-placeholder { .ms-tr { text-align: right; } -.el-button + .el-button { - margin-left: 0; -} .ms-weixin-content { width: calc(100% - 140px); } -.keyword-list { - padding: 14px; +.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-hover { + cursor: pointer; +} +.ms-hover:hover { + color: #0099ff; + background: #fff; + border-color: #0099ff; } diff --git a/src/main/webapp/static/mweixin/css/keyword-reply.css b/src/main/webapp/static/mweixin/css/keyword-reply.css index 0e7e2b61..3e4bd1f6 100644 --- a/src/main/webapp/static/mweixin/css/keyword-reply.css +++ b/src/main/webapp/static/mweixin/css/keyword-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 { @@ -74,7 +74,7 @@ textarea::-webkit-input-placeholder { .ms-container { margin: 12px; height: calc(100% - 24px); - padding: 14px 14px 0 14px; + padding: 14px; background: #fff; } .ms-header { @@ -84,6 +84,9 @@ textarea::-webkit-input-placeholder { background: #fff; height: 50px; } +.ms-header button { + height: 30px; +} .ms-pagination { padding: 20px 0; text-align: right; @@ -94,12 +97,32 @@ textarea::-webkit-input-placeholder { .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; +} +.ms-hover { + cursor: pointer; +} +.ms-hover:hover { + color: #0099ff; + background: #fff; + border-color: #0099ff; +} .keyword-reply { padding-bottom: 20px; } @@ -148,7 +171,7 @@ textarea::-webkit-input-placeholder { bottom: 66px; font-weight: initial; font-size: 12px; - color: #999; + color: #aaa; } .keyword-reply .ms-keyword-reply-content .el-form-item__content .el-icon-delete:hover { cursor: pointer; diff --git a/src/main/webapp/static/mweixin/css/material-bank-form.css b/src/main/webapp/static/mweixin/css/material-bank-form.css index 3aa9f2c4..974668af 100644 --- a/src/main/webapp/static/mweixin/css/material-bank-form.css +++ b/src/main/webapp/static/mweixin/css/material-bank-form.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 { @@ -74,7 +74,7 @@ textarea::-webkit-input-placeholder { .ms-container { margin: 12px; height: calc(100% - 24px); - padding: 14px 14px 0 14px; + padding: 14px; background: #fff; } .ms-header { @@ -84,6 +84,9 @@ textarea::-webkit-input-placeholder { background: #fff; height: 50px; } +.ms-header button { + height: 30px; +} .ms-pagination { padding: 20px 0; text-align: right; @@ -94,9 +97,6 @@ textarea::-webkit-input-placeholder { .ms-tr { text-align: right; } -.el-button + .el-button { - margin-left: 0; -} .ms-weixin-content { width: calc(100% - 140px); } @@ -115,6 +115,14 @@ textarea::-webkit-input-placeholder { border-top: 1px solid #ddd; padding: 15px !important; } +.ms-hover { + cursor: pointer; +} +.ms-hover:hover { + color: #0099ff; + background: #fff; + border-color: #0099ff; +} .material-bank-form > .el-dialog__wrapper > .el-dialog { width: 895px !important; height: 587px !important; diff --git a/src/main/webapp/static/mweixin/css/material-list.css b/src/main/webapp/static/mweixin/css/material-list.css index e4eb8a0f..3054da88 100644 --- a/src/main/webapp/static/mweixin/css/material-list.css +++ b/src/main/webapp/static/mweixin/css/material-list.css @@ -84,6 +84,9 @@ textarea::-webkit-input-placeholder { background: #fff; height: 50px; } +.ms-header button { + height: 30px; +} .ms-pagination { padding: 20px 0; text-align: right; @@ -94,12 +97,32 @@ textarea::-webkit-input-placeholder { .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; +} +.ms-hover { + cursor: pointer; +} +.ms-hover:hover { + color: #0099ff; + background: #fff; + border-color: #0099ff; +} .ms-admin-material-list { background: #fff; margin: 12px; @@ -133,11 +156,17 @@ textarea::-webkit-input-placeholder { text-overflow: ellipsis; white-space: nowrap; display: block; + cursor: pointer; +} +.ms-admin-material-list .ms-admin-material-item .body span:hover { + color: #0099ff; + background: #fff; + border-color: #0099ff; } .ms-admin-material-list .ms-admin-material-item .body img { width: 170px; height: 110px; - margin: 0.5em auto; + margin: 0 auto; object-fit: cover; } .ms-admin-material-list .ms-admin-material-item .body p { @@ -158,6 +187,11 @@ textarea::-webkit-input-placeholder { margin: auto; cursor: pointer; } +.ms-admin-material-list .ms-admin-material-item .footer i:hover { + color: #0099ff; + background: #fff; + border-color: #0099ff; +} .ms-admin-material-list .ms-admin-material-item .footer em { width: 1px; height: 1em; diff --git a/src/main/webapp/static/mweixin/css/menu.css b/src/main/webapp/static/mweixin/css/menu.css index 887825b6..72d56da4 100644 --- a/src/main/webapp/static/mweixin/css/menu.css +++ b/src/main/webapp/static/mweixin/css/menu.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 { @@ -74,7 +74,7 @@ textarea::-webkit-input-placeholder { .ms-container { margin: 12px; height: calc(100% - 24px); - padding: 14px 14px 0 14px; + padding: 14px; background: #fff; } .ms-header { @@ -84,6 +84,9 @@ textarea::-webkit-input-placeholder { background: #fff; height: 50px; } +.ms-header button { + height: 30px; +} .ms-pagination { padding: 20px 0; text-align: right; @@ -94,12 +97,32 @@ textarea::-webkit-input-placeholder { .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; +} +.ms-hover { + cursor: pointer; +} +.ms-hover:hover { + color: #0099ff; + background: #fff; + border-color: #0099ff; +} .ms-admin-menu { min-height: 100vh; min-width: 140px; @@ -133,6 +156,10 @@ textarea::-webkit-input-placeholder { min-height: calc(100vh - 50px); background: #fff; } +.ms-admin-menu .el-main .ms-admin-menu-menu .el-menu-item { + min-width: 140px; + width: 140px; +} .ms-admin-menu .el-main .ms-admin-material-item { min-width: 100% !important; } diff --git a/src/main/webapp/static/mweixin/css/message-reply.css b/src/main/webapp/static/mweixin/css/message-reply.css index 05590b86..e5a991c9 100644 --- a/src/main/webapp/static/mweixin/css/message-reply.css +++ b/src/main/webapp/static/mweixin/css/message-reply.css @@ -74,7 +74,7 @@ textarea::-webkit-input-placeholder { .ms-container { margin: 12px; height: calc(100% - 24px); - padding: 14px 14px 0 14px; + padding: 14px; background: #fff; } .ms-header { @@ -84,6 +84,9 @@ textarea::-webkit-input-placeholder { background: #fff; height: 50px; } +.ms-header button { + height: 30px; +} .ms-pagination { padding: 20px 0; text-align: right; @@ -94,9 +97,6 @@ textarea::-webkit-input-placeholder { .ms-tr { text-align: right; } -.el-button + .el-button { - margin-left: 0; -} .ms-weixin-content { width: calc(100% - 140px); } @@ -115,11 +115,24 @@ textarea::-webkit-input-placeholder { border-top: 1px solid #ddd; padding: 15px !important; } +.ms-hover { + cursor: pointer; +} +.ms-hover:hover { + color: #0099ff; + background: #fff; + border-color: #0099ff; +} +.ms-admin-message-reply .ms-container { + display: flex; +} +.ms-admin-message-reply .ms-container .message-reply-tabs { + padding-left: 12px; +} .ms-message-reply { display: flex; justify-content: flex-start; - padding: 20px; - height: 267px; + height: auto; } .ms-message-reply > div:first-child { margin-right: 10px; @@ -157,14 +170,17 @@ textarea::-webkit-input-placeholder { } .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; + right: 7px; bottom: 66px; font-weight: initial; font-size: 12px; color: #aaa; + cursor: pointer; } .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; + color: #0099ff; + background: #fff; + border-color: #0099ff; } .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; @@ -181,6 +197,12 @@ textarea::-webkit-input-placeholder { .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; + cursor: pointer; +} +.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 { + color: #0099ff; + background: #fff; + border-color: #0099ff; } .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; diff --git a/src/main/webapp/static/mweixin/css/new-pic-form.css b/src/main/webapp/static/mweixin/css/new-pic-form.css index 255fec5c..0697f99b 100644 --- a/src/main/webapp/static/mweixin/css/new-pic-form.css +++ b/src/main/webapp/static/mweixin/css/new-pic-form.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 { @@ -74,7 +74,7 @@ textarea::-webkit-input-placeholder { .ms-container { margin: 12px; height: calc(100% - 24px); - padding: 14px 14px 0 14px; + padding: 14px; background: #fff; } .ms-header { @@ -84,6 +84,9 @@ textarea::-webkit-input-placeholder { background: #fff; height: 50px; } +.ms-header button { + height: 30px; +} .ms-pagination { padding: 20px 0; text-align: right; @@ -94,9 +97,6 @@ textarea::-webkit-input-placeholder { .ms-tr { text-align: right; } -.el-button + .el-button { - margin-left: 0; -} .ms-weixin-content { width: calc(100% - 140px); } @@ -115,6 +115,14 @@ textarea::-webkit-input-placeholder { border-top: 1px solid #ddd; padding: 15px !important; } +.ms-hover { + cursor: pointer; +} +.ms-hover:hover { + color: #0099ff; + background: #fff; + border-color: #0099ff; +} .new-pic-form dl { margin: 0; } @@ -123,7 +131,7 @@ textarea::-webkit-input-placeholder { line-height: 1; font-weight: initial; font-size: 12px; - color: #999; + color: #aaa; } .new-pic-form dt { display: inline-block; diff --git a/src/main/webapp/static/mweixin/css/picture-list.css b/src/main/webapp/static/mweixin/css/picture-list.css index 71b93ff1..3af945ef 100644 --- a/src/main/webapp/static/mweixin/css/picture-list.css +++ b/src/main/webapp/static/mweixin/css/picture-list.css @@ -84,6 +84,9 @@ textarea::-webkit-input-placeholder { background: #fff; height: 50px; } +.ms-header button { + height: 30px; +} .ms-pagination { padding: 20px 0; text-align: right; @@ -94,9 +97,6 @@ textarea::-webkit-input-placeholder { .ms-tr { text-align: right; } -.el-button + .el-button { - margin-left: 0; -} .ms-weixin-content { width: calc(100% - 140px); } @@ -115,14 +115,30 @@ textarea::-webkit-input-placeholder { border-top: 1px solid #ddd; padding: 15px !important; } +.ms-hover { + cursor: pointer; +} +.ms-hover:hover { + color: #0099ff; + background: #fff; + border-color: #0099ff; +} +.ms-admin-picture { + height: 100%; +} .ms-admin-picture-list { background: #fff; margin: 12px; padding: 14px; display: flex; - flex-wrap: wrap; } .ms-admin-picture-list .ms-admin-picture-item { + display: flex; + flex-wrap: wrap; + align-items: flex-start; + width: calc(100% - 220px) !important; +} +.ms-admin-picture-list .ms-admin-picture-item > div { margin: 0 24px 0 0; padding: 10px 10px 0 10px; width: 230px; @@ -131,38 +147,94 @@ textarea::-webkit-input-placeholder { border: 1px solid #e6e6e6; border-radius: 4px; } -.ms-admin-picture-list .ms-admin-picture-item .body { +.ms-admin-picture-list .ms-admin-picture-item > div .body { display: flex; flex-direction: column; line-height: 2em; } -.ms-admin-picture-list .ms-admin-picture-item .body div { +.ms-admin-picture-list .ms-admin-picture-item > div .body div { margin-top: 0.5em; display: flex; align-items: center; } -.ms-admin-picture-list .ms-admin-picture-item .body div span { +.ms-admin-picture-list .ms-admin-picture-item > div .body div span { overflow: hidden; text-overflow: ellipsis; white-space: nowrap; display: block; + cursor: pointer; +} +.ms-admin-picture-list .ms-admin-picture-item > div .body div span:hover { + color: #0099ff; + background: #fff; + border-color: #0099ff; } -.ms-admin-picture-list .ms-admin-picture-item .body img { +.ms-admin-picture-list .ms-admin-picture-item > div .body img { width: 100%; - height: 110px; + height: 130px; object-fit: cover; } -.ms-admin-picture-list .ms-admin-picture-item .footer { +.ms-admin-picture-list .ms-admin-picture-item > div .footer { display: flex; padding: 14px 0; } -.ms-admin-picture-list .ms-admin-picture-item .footer i { +.ms-admin-picture-list .ms-admin-picture-item > div .footer i { color: #999; margin: auto; cursor: pointer; } -.ms-admin-picture-list .ms-admin-picture-item .footer em { +.ms-admin-picture-list .ms-admin-picture-item > div .footer i:hover { + color: #0099ff; + background: #fff; + border-color: #0099ff; +} +.ms-admin-picture-list .ms-admin-picture-item > div .footer em { width: 1px; height: 1em; background: #e6e6e6; } +.ms-admin-picture-list .ms-admin-picture-show { + min-width: 220px; + height: 100%; + margin: -14px 0; + padding: 14px; + border-left: 1px solid #e6e6e6; +} +.ms-admin-picture-list .ms-admin-picture-show > span { + padding: 10px; + display: flex; + background: #f2f2f6; + font-weight: bold; +} +.ms-admin-picture-list .ms-admin-picture-show > div { + display: flex; + align-items: center; + padding: 10px; + font-size: 14px; +} +.ms-admin-picture-list .ms-admin-picture-show > div span { + margin-right: auto; +} +.ms-admin-picture-list .ms-admin-picture-show > div i { + margin-left: 10px; + cursor: pointer; +} +.ms-admin-picture-list .ms-admin-picture-show > div i:hover { + color: #0099ff; + background: #fff; + border-color: #0099ff; +} +.ms-admin-picture-list .ms-admin-picture-show > p { + margin: 0; + padding: 10px; + border: 1px solid #e6e6e6; + display: flex; + justify-content: center; + align-items: center; + cursor: pointer; +} +.ms-admin-picture-list .ms-admin-picture-show > p:hover { + color: #0099ff; + background: #fff; + border-color: #0099ff; +} diff --git a/src/main/webapp/static/mweixin/custom-menu.less b/src/main/webapp/static/mweixin/custom-menu.less index 1e8115ff..67c1e4a7 100644 --- a/src/main/webapp/static/mweixin/custom-menu.less +++ b/src/main/webapp/static/mweixin/custom-menu.less @@ -1,143 +1,146 @@ @import "../ms-admin/4.7.0/less/app.less"; // 自定义菜单 -.ms-custom-menu{ +.ms-custom-menu { color: rgb(242, 242, 246); - .ms-custom-container{ - margin: 10px; + .ms-custom-container { .ms-flex(); + &>.ms-container{ + padding: 0; + background: transparent; + } // 侧边 - .el-aside{ + .el-aside { background: #fff; - .ms-width-height(280px,470px) !important; + .ms-width-height(280px, 470px) !important; // 微信界面 - .el-container{ + .el-container { // 头部 - .el-header{ + .el-header { .ms-line-height(40px) !important; - .ms-font(16px,#fff); + .ms-font(16px, #fff); text-align: center; background: #323232; } - .el-main{ + .el-main { padding: 0; - .ms-width-height(280px,379px) !important; + .ms-width-height(280px, 379px) !important; } - .el-footer{ + .el-footer { white-space: nowrap; padding: 0; font-size: 0; background-color: #FAFAFA; - .ms-width-height(280px,50px) !important; + .ms-width-height(280px, 50px) !important; .ms-flex(flex-start); border-top: 1px solid @borderColor !important; - >.el-button{ - .ms-width-height(40px,50px) !important; - padding:0 !important; + >.el-button { + .ms-width-height(40px, 50px) !important; + padding: 0 !important; border: none !important; border-right: 1px solid @borderColor !important; } - .el-button{ + .el-button { border-radius: 0 !important; - height:50px !important; + height: 50px !important; background: transparent !important; } - .ms-create-menu{ + .ms-create-menu { flex: 1; font-size: 0; .ms-flex(space-between); - .el-button{ - flex: 1; - border: none !important; - background: transparent !important; - span{ - color:#333; - } - } - .ms-create-sub-menu{ + .el-button { + flex: 1; + border: none !important; + background: transparent !important; + span { + color: #333; + } + } + .ms-create-sub-menu { flex: 1; - position: relative; - >.el-button:first-child{ - width:100%; - } - >.el-button:last-child{ - position: absolute; - top: -60px; - left: 0; - border: 1px solid @borderColor !important; - width: 100%; - } - } + position: relative; + >.el-button:first-child { + width: 100%; + } + >.el-button:last-child { + position: absolute; + top: -60px; + left: 0; + border: 1px solid @borderColor !important; + width: 100%; + } + } // 添加菜单 - .el-button--default{ - border-left: 1px solid @borderColor !important; - padding:0 !important; - flex: 1; - } + .el-button--default { + border-left: 1px solid @borderColor !important; + padding: 0 !important; + flex: 1; + } } } } } // 内容 - .el-main{ + .el-main { padding: 0; padding-left: 20px; flex: 1; height: 470px; // 内容区域卡片 - .custom-menu-card{ + .custom-menu-card { height: 100%; // 内容菜单表单 - .ms-custom-menu-name{ - .el-form-item__content{ - .el-input{ - .ms-width-height(153px,30px) !important; + .ms-custom-menu-name { + .el-form-item__content { + .el-input { + .ms-width-height(153px, 30px) !important; } .ms-flex(flex-start); - span{ + span { margin-left: 10px; - .ms-font(@auxiliarySize,@auxiliaryColor); + .ms-font(@auxiliarySize, @auxiliaryColor); } } } // 菜单内容 - .ms-custom-menu-content{ - .el-tabs{ + .ms-custom-menu-content { + .el-tabs { border: 1px solid @borderColor; - .el-tabs__header{ + .el-tabs__header { background: #f2f2f6; - border-radius:4px 4px 0 0 !important; + border-radius: 4px 4px 0 0 !important; margin: 0 !important; - .el-tabs__nav-scroll{ + .el-tabs__nav-scroll { padding: 0 20px; - i{ + i { margin-right: 8px; } } } - .el-tab-pane{ + .el-tab-pane { padding: 20px; - .ms-width-height(100%,220px); + .ms-width-height(100%, 220px); .ms-flex(); // 素材库 - >div{ + >div { flex: 1; border: 1px dashed @borderColor; .ms-flex(center); align-items: center; flex-direction: column; - i{ - .ms-font(20px,@themeColor,bolder); + i { + .ms-font(20px, @themeColor, bolder); } - span{ - margin-top:8px; + span { + margin-top: 8px; line-height: 1; } - &:hover{ + &:hover { cursor: pointer; } } - >div:last-child{ - margin-left:20px; + >div:last-child { + margin-left: 20px; } } } diff --git a/src/main/webapp/static/mweixin/keyword-list.less b/src/main/webapp/static/mweixin/keyword-list.less index f4ff5d44..11025585 100644 --- a/src/main/webapp/static/mweixin/keyword-list.less +++ b/src/main/webapp/static/mweixin/keyword-list.less @@ -1,5 +1 @@ -@import "../ms-admin/4.7.0/less/app.less"; -// 关键字列表 -.keyword-list{ - padding:14px; -} \ No newline at end of file +@import "../ms-admin/4.7.0/less/app.less"; \ No newline at end of file diff --git a/src/main/webapp/static/mweixin/keyword-reply.less b/src/main/webapp/static/mweixin/keyword-reply.less index d5f5ec75..20de4d53 100644 --- a/src/main/webapp/static/mweixin/keyword-reply.less +++ b/src/main/webapp/static/mweixin/keyword-reply.less @@ -1,25 +1,25 @@ @import "../ms-admin/4.7.0/less/app.less"; // 关键字回复 .keyword-reply { - padding-bottom:20px; + padding-bottom: 20px; .el-select .el-input { - width: 90px; + width: 90px; >input { padding: 0 10px !important; } } // 关键词 - .ms-keyword-input{ + .ms-keyword-input { margin-bottom: 15px !important; // 尾词 - .el-input__suffix{ + .el-input__suffix { line-height: 28px; } // 添加 - .el-icon-plus{ - margin-left:20px; - .ms-font(@defalutSize,@themeColor,bold); - &:hover{ + .el-icon-plus { + margin-left: 20px; + .ms-font(@defalutSize, @themeColor, bold); + &:hover { cursor: pointer; } } @@ -54,7 +54,7 @@ textarea { height: 127px !important; border: none !important; - border-bottom: 1px solid @borderColor !important; + border-bottom: 1px solid @borderColor !important; } .footer { height: 58px; diff --git a/src/main/webapp/static/mweixin/material-bank-form.less b/src/main/webapp/static/mweixin/material-bank-form.less index e88107ab..c76c496c 100644 --- a/src/main/webapp/static/mweixin/material-bank-form.less +++ b/src/main/webapp/static/mweixin/material-bank-form.less @@ -7,7 +7,7 @@ >.el-dialog__body{ .ms-width-height(100%,469px) !important; padding:0 !important; - >.el-tabs{ + >.el-tabs{ height: 100%; // 侧边导航 .el-tabs__header{ diff --git a/src/main/webapp/static/mweixin/material-list.less b/src/main/webapp/static/mweixin/material-list.less index 5c0f9f91..bf598068 100644 --- a/src/main/webapp/static/mweixin/material-list.less +++ b/src/main/webapp/static/mweixin/material-list.less @@ -25,10 +25,11 @@ line-height: 2em; span { .ms-ellipsis; + .ms-hover; } img { .ms-width-height(170px, 110px); - margin: 0.5em auto; + margin: 0 auto; object-fit: cover; } p { @@ -43,7 +44,7 @@ i { color: @contentColor; margin: auto; - cursor: pointer; + .ms-hover; } em { .ms-width-height(1px, 1em); diff --git a/src/main/webapp/static/mweixin/menu.less b/src/main/webapp/static/mweixin/menu.less index 126d0653..f2836918 100644 --- a/src/main/webapp/static/mweixin/menu.less +++ b/src/main/webapp/static/mweixin/menu.less @@ -27,6 +27,10 @@ .ms-admin-menu-menu { min-height: ~'calc(100vh - 50px)'; background: #fff; + .el-menu-item{ + min-width: 140px; + width: 140px; + } } .ms-admin-material-item { min-width: 100% !important; diff --git a/src/main/webapp/static/mweixin/message-reply.less b/src/main/webapp/static/mweixin/message-reply.less index 048095ae..2cb3726a 100644 --- a/src/main/webapp/static/mweixin/message-reply.less +++ b/src/main/webapp/static/mweixin/message-reply.less @@ -1,72 +1,79 @@ @import "../ms-admin/4.7.0/less/app.less"; +.ms-admin-message-reply { + .ms-container { + display: flex; + .message-reply-tabs { + padding-left: 12px; + } + } +} + // 消息回复 && 关注回复 -.ms-message-reply{ +.ms-message-reply { .ms-flex(flex-start); - padding:20px; - height: 267px; - >div:first-child{ - margin-right:10px; - line-height: 40px; + height: auto; + >div:first-child { + margin-right: 10px; + line-height: 40px; } // 导航切换 - .message-reply-tabs{ + .message-reply-tabs { flex: 1; - border-radius:4px 4px 0 0 !important; + border-radius: 4px 4px 0 0 !important; border: none !important; - .el-tabs__header{ + .el-tabs__header { // background: #f2f2f6; margin: 0 !important; - .el-tabs__nav-scroll{ + .el-tabs__nav-scroll { padding: 0 20px; - border:1px solid @borderColor; + border: 1px solid @borderColor; } } - .el-tabs__content{ - border:1px solid @borderColor; - .el-tab-pane{ + .el-tabs__content { + border: 1px solid @borderColor; + .el-tab-pane { padding: 0 !important; width: 100%; .ms-flex(); - >.el-form{ + >.el-form { width: 100%; - .ms-message-reply-content{ + .ms-message-reply-content { margin: 0; - .el-form-item__content{ + .el-form-item__content { position: relative; - .el-icon-delete{ + .el-icon-delete { position: absolute; - right: 5px; + right: 7px; bottom: 66px; - .ms-font(@auxiliarySize,@auxiliaryColor); - &:hover{ - cursor: pointer; - } + .ms-font(@auxiliarySize, @auxiliaryColor); + .ms-hover; } - textarea{ + textarea { height: 127px !important; border: none !important; border-bottom: 1px solid @borderColor !important; } - .footer{ + .footer { height: 58px; padding: 0 14px; .ms-flex(flex-start); align-items: center; - i{ + i { margin-right: 12px; font-size: 16px; + .ms-hover; } - a{ - .ms-font(@defalutSize,@themeColor); + a { + .ms-font(@defalutSize, @themeColor); } - i,a{ - &:hover{ + i, + a { + &:hover { cursor: pointer; } } } } - } } } diff --git a/src/main/webapp/static/mweixin/new-pic-form.less b/src/main/webapp/static/mweixin/new-pic-form.less index 16a0c6ed..9e7db68a 100644 --- a/src/main/webapp/static/mweixin/new-pic-form.less +++ b/src/main/webapp/static/mweixin/new-pic-form.less @@ -11,5 +11,5 @@ dt{ display: inline-block; margin-bottom: 8px; - } + } } \ No newline at end of file diff --git a/src/main/webapp/static/mweixin/picture-list.less b/src/main/webapp/static/mweixin/picture-list.less index f80c704f..4b96ba72 100644 --- a/src/main/webapp/static/mweixin/picture-list.less +++ b/src/main/webapp/static/mweixin/picture-list.less @@ -1,46 +1,90 @@ @import "../ms-admin/4.7.0/less/app.less"; +.ms-admin-picture { + height: 100%; +} + +//图片列表 .ms-admin-picture-list { background: #fff; .ms-margin-padding(12px, 14px); display: flex; - flex-wrap: wrap; //单个素材 .ms-admin-picture-item { - .ms-margin-padding(0 24px 0 0, 10px 10px 0 10px); - width: 230px; display: flex; - flex-direction: column; - border: 1px solid #e6e6e6; - border-radius: 4px; - .body { + flex-wrap: wrap; + align-items: flex-start; + width: ~'calc(100% - 220px)' !important; + &>div { + .ms-margin-padding(0 24px 0 0, 10px 10px 0 10px); + width: 230px; display: flex; flex-direction: column; - line-height: 2em; - div { - margin-top: 0.5em; + border: 1px solid #e6e6e6; + border-radius: 4px; + .body { display: flex; - align-items: center; - span { - .ms-ellipsis; + flex-direction: column; + line-height: 2em; + div { + margin-top: 0.5em; + display: flex; + align-items: center; + span { + .ms-ellipsis; + .ms-hover; + } + } + img { + .ms-width-height(100%, 130px); + object-fit: cover; } } - img { - .ms-width-height(100%, 110px); - object-fit: cover; + .footer { + display: flex; + padding: 14px 0; + i { + color: @contentColor; + margin: auto; + .ms-hover; + } + em { + .ms-width-height(1px, 1em); + background: #e6e6e6; + } } } - .footer { + } + .ms-admin-picture-show { + min-width: 220px; + height: 100%; + .ms-margin-padding(-14px 0, 14px); + border-left: 1px solid #e6e6e6; + &>span { + padding: 10px; display: flex; - padding: 14px 0; + background: #f2f2f6; + font-weight: bold; + } + &>div { + .ms-align-center; + padding: 10px; + font-size: 14px; + span { + margin-right: auto; + } i { - color: @contentColor; - margin: auto; + .ms-hover; + margin-left: 10px; cursor: pointer; } - em { - .ms-width-height(1px, 1em); - background: #e6e6e6; - } + } + &>p { + margin: 0; + padding: 10px; + border: 1px solid #e6e6e6; + .ms-flex(center); + align-items: center; + .ms-hover; } } } \ No newline at end of file