diff --git a/src/main/webapp/WEB-INF/manager/cms/article/article_form.ftl b/src/main/webapp/WEB-INF/manager/cms/article/article_form.ftl index 8cc97bb7..93269e4f 100644 --- a/src/main/webapp/WEB-INF/manager/cms/article/article_form.ftl +++ b/src/main/webapp/WEB-INF/manager/cms/article/article_form.ftl @@ -64,7 +64,7 @@ var articleBasicId=0; $(function(){ //页面标题 var articleTitle="<#if categoryTitle?has_content>${categoryTitle} <#if article.basicId !=0>编辑文章<#else>添加文章"; - $(".ms-content-body-title>span").html(articleTitle); + $(".ms-weixin-content-body-title>span").html(articleTitle); //隐藏跳转地址 $("input[name='articleUrl']").parent().hide(); 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 c8116697..19a72df3 100644 --- a/src/main/webapp/WEB-INF/manager/mweixin/keyword/form.ftl +++ b/src/main/webapp/WEB-INF/manager/mweixin/keyword/form.ftl @@ -1,7 +1,7 @@ -
+
diff --git a/src/main/webapp/WEB-INF/manager/mweixin/keyword/index.ftl b/src/main/webapp/WEB-INF/manager/mweixin/keyword/index.ftl index 704ca4b8..970e3c31 100644 --- a/src/main/webapp/WEB-INF/manager/mweixin/keyword/index.ftl +++ b/src/main/webapp/WEB-INF/manager/mweixin/keyword/index.ftl @@ -1,7 +1,7 @@ -
+
diff --git a/src/main/webapp/WEB-INF/manager/mweixin/menu/index.ftl b/src/main/webapp/WEB-INF/manager/mweixin/menu/index.ftl index c4c4b3b9..d0d0571f 100644 --- a/src/main/webapp/WEB-INF/manager/mweixin/menu/index.ftl +++ b/src/main/webapp/WEB-INF/manager/mweixin/menu/index.ftl @@ -1,6 +1,6 @@ -
+
diff --git a/src/main/webapp/WEB-INF/manager/mweixin/message/index.ftl b/src/main/webapp/WEB-INF/manager/mweixin/message/index.ftl index 24cbac7a..9ce8ed23 100644 --- a/src/main/webapp/WEB-INF/manager/mweixin/message/index.ftl +++ b/src/main/webapp/WEB-INF/manager/mweixin/message/index.ftl @@ -1,6 +1,6 @@ -
+
回复内容
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 3791dcce..17930624 100644 --- a/src/main/webapp/WEB-INF/manager/mweixin/metarial/index.ftl +++ b/src/main/webapp/WEB-INF/manager/mweixin/metarial/index.ftl @@ -1,6 +1,6 @@ -
+
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 d637a07a..d3c7579d 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 @@ -94,6 +94,6 @@ textarea::-webkit-input-placeholder { margin-left: 0 } -.ms-content{ - width: ~'calc(100% - 200px)'; +.ms-weixin-content{ + width: ~'calc(100% - 140px)'; } diff --git a/src/main/webapp/static/mweixin/css/article.css b/src/main/webapp/static/mweixin/css/article.css index f48a8f76..fa7d2402 100644 --- a/src/main/webapp/static/mweixin/css/article.css +++ b/src/main/webapp/static/mweixin/css/article.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; @@ -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,9 @@ textarea::-webkit-input-placeholder { .el-button + .el-button { margin-left: 0; } +.ms-weixin-content { + width: calc(100% - 140px); +} .ms-article .el-container .el-aside { padding: 14px; } @@ -107,7 +112,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; diff --git a/src/main/webapp/static/mweixin/css/custom-menu.css b/src/main/webapp/static/mweixin/css/custom-menu.css index 1c45d912..ac443c50 100644 --- a/src/main/webapp/static/mweixin/css/custom-menu.css +++ b/src/main/webapp/static/mweixin/css/custom-menu.css @@ -97,8 +97,8 @@ textarea::-webkit-input-placeholder { .el-button + .el-button { margin-left: 0; } -.ms-content { - width: calc(100% - 200px); +.ms-weixin-content { + width: calc(100% - 140px); } .ms-custom-menu { color: #f2f2f6; diff --git a/src/main/webapp/static/mweixin/css/keyword-list.css b/src/main/webapp/static/mweixin/css/keyword-list.css index 8f8a22d4..b883020a 100644 --- a/src/main/webapp/static/mweixin/css/keyword-list.css +++ b/src/main/webapp/static/mweixin/css/keyword-list.css @@ -97,8 +97,8 @@ textarea::-webkit-input-placeholder { .el-button + .el-button { margin-left: 0; } -.ms-content { - width: calc(100% - 200px); +.ms-weixin-content { + width: calc(100% - 140px); } .keyword-list { padding: 14px; diff --git a/src/main/webapp/static/mweixin/css/keyword-reply.css b/src/main/webapp/static/mweixin/css/keyword-reply.css index dd007e31..0e7e2b61 100644 --- a/src/main/webapp/static/mweixin/css/keyword-reply.css +++ b/src/main/webapp/static/mweixin/css/keyword-reply.css @@ -97,8 +97,8 @@ textarea::-webkit-input-placeholder { .el-button + .el-button { margin-left: 0; } -.ms-content { - width: calc(100% - 200px); +.ms-weixin-content { + width: calc(100% - 140px); } .keyword-reply { padding-bottom: 20px; diff --git a/src/main/webapp/static/mweixin/css/material-list.css b/src/main/webapp/static/mweixin/css/material-list.css index 46d0a4e4..aa2ea762 100644 --- a/src/main/webapp/static/mweixin/css/material-list.css +++ b/src/main/webapp/static/mweixin/css/material-list.css @@ -97,8 +97,8 @@ textarea::-webkit-input-placeholder { .el-button + .el-button { margin-left: 0; } -.ms-content { - width: calc(100% - 200px); +.ms-weixin-content { + width: calc(100% - 140px); } .ms-admin-material-list { margin: 15px; diff --git a/src/main/webapp/static/mweixin/css/menu.css b/src/main/webapp/static/mweixin/css/menu.css index b9611e81..7ff61279 100644 --- a/src/main/webapp/static/mweixin/css/menu.css +++ b/src/main/webapp/static/mweixin/css/menu.css @@ -97,12 +97,12 @@ textarea::-webkit-input-placeholder { .el-button + .el-button { margin-left: 0; } -.ms-content { - width: calc(100% - 200px); +.ms-weixin-content { + width: calc(100% - 140px); } .ms-admin-menu { min-height: 100vh; - min-width: 200px; + min-width: 140px; } .ms-admin-menu .ms-header { border-right: solid 1px #e6e6e6; diff --git a/src/main/webapp/static/mweixin/css/message-reply.css b/src/main/webapp/static/mweixin/css/message-reply.css index ea982cfc..21270200 100644 --- a/src/main/webapp/static/mweixin/css/message-reply.css +++ b/src/main/webapp/static/mweixin/css/message-reply.css @@ -97,8 +97,8 @@ textarea::-webkit-input-placeholder { .el-button + .el-button { margin-left: 0; } -.ms-content { - width: calc(100% - 200px); +.ms-weixin-content { + width: calc(100% - 140px); } .ms-message-reply { display: flex; diff --git a/src/main/webapp/static/mweixin/menu.less b/src/main/webapp/static/mweixin/menu.less index 9abc8813..cd11f59b 100644 --- a/src/main/webapp/static/mweixin/menu.less +++ b/src/main/webapp/static/mweixin/menu.less @@ -1,7 +1,7 @@ @import "../ms-admin/4.7.0/less/app.less"; .ms-admin-menu { min-height: 100vh; - min-width: 200px; + min-width: 140px; .ms-header { border-right: solid 1px #e6e6e6; div {