sunjianxi
/
cycgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Signed-off-by: yinxr <2273460044@qq.com>

Browse Source
master
yinxr 7 years ago
parent 2b6ce731e0
commit b77a2802bf
9 changed files with 194 additions and 83 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/main/webapp/WEB-INF/manager/index.ftl
  2. 27
      src/main/webapp/static/ms-admin/4.7.0/css/index.css
  3. 49
      src/main/webapp/static/ms-admin/4.7.0/css/login.css
  4. 3
      src/main/webapp/static/ms-admin/4.7.0/less/index.less
  5. 2
      src/main/webapp/static/ms-admin/4.7.0/less/login.less
  6. 30
      src/main/webapp/static/mweixin/article.less
  7. 35
      src/main/webapp/static/mweixin/css/article.css
  8. 49
      src/main/webapp/static/mweixin/css/message-reply.css
  9. 80
      src/main/webapp/static/mweixin/message-reply.less

2
src/main/webapp/WEB-INF/manager/index.ftl
Unescape View File

@ -11,7 +11,7 @@
</head> </head>
<body> <body>
<div id="app"> <div id="app" class="index">
<el-container> <el-container>
<!--头部--> <!--头部-->
<el-header class="ms-admin-header"> <el-header class="ms-admin-header">

27
src/main/webapp/static/ms-admin/4.7.0/css/index.css
Unescape View File

@ -22,8 +22,10 @@
html, html,
body { body {
min-height: 100vh; min-height: 100vh;
width: 100vw;
background-color: #eee; background-color: #eee;
margin: 0; margin: 0;
display: flex;
font-weight: initial !important; font-weight: initial !important;
font-size: 14px !important; font-size: 14px !important;
color: #333 !important; color: #333 !important;
@ -48,7 +50,7 @@ input::-webkit-input-placeholder,
textarea::-webkit-input-placeholder { textarea::-webkit-input-placeholder {
font-weight: initial; font-weight: initial;
font-size: 12px; font-size: 12px;
color: #999; color: #aaa;
resize: none; resize: none;
} }
*::-webkit-scrollbar { *::-webkit-scrollbar {
@ -71,7 +73,7 @@ textarea::-webkit-input-placeholder {
} }
.ms-container { .ms-container {
margin: 12px; margin: 12px;
height: 100%; height: calc(100% - 24px);
padding: 14px 14px 0 14px; padding: 14px 14px 0 14px;
background: #fff; background: #fff;
} }
@ -95,6 +97,27 @@ textarea::-webkit-input-placeholder {
.el-button + .el-button { .el-button + .el-button {
margin-left: 0; 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 { .ms-admin-header {
display: flex; display: flex;
padding: 0; padding: 0;

49
src/main/webapp/static/ms-admin/4.7.0/css/login.css
Unescape View File

@ -22,8 +22,10 @@
html, html,
body { body {
min-height: 100vh; min-height: 100vh;
width: 100vw;
background-color: #eee; background-color: #eee;
margin: 0; margin: 0;
display: flex;
font-weight: initial !important; font-weight: initial !important;
font-size: 14px !important; font-size: 14px !important;
color: #333 !important; color: #333 !important;
@ -48,7 +50,7 @@ input::-webkit-input-placeholder,
textarea::-webkit-input-placeholder { textarea::-webkit-input-placeholder {
font-weight: initial; font-weight: initial;
font-size: 12px; font-size: 12px;
color: #999; color: #aaa;
resize: none; resize: none;
} }
*::-webkit-scrollbar { *::-webkit-scrollbar {
@ -69,7 +71,52 @@ textarea::-webkit-input-placeholder {
background-color: #ddd; 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 { .login {
width: 100vw;
height: 100vh; height: 100vh;
} }
.login .ms-admin-login-container { .login .ms-admin-login-container {

3
src/main/webapp/static/ms-admin/4.7.0/less/index.less
Unescape View File

@ -1,5 +1,8 @@
@import "app.less"; @import "app.less";
//头部 //头部
.index{
width: 100%;
}
.ms-admin-header { .ms-admin-header {
display: flex; display: flex;
padding: 0; padding: 0;

2
src/main/webapp/static/ms-admin/4.7.0/less/login.less
Unescape View File

@ -1,7 +1,7 @@
@import "app.less"; @import "app.less";
// 登录 // 登录
.login{ .login{
height: 100vh; .ms-width-height(100vw,100vh);
.ms-admin-login-container{ .ms-admin-login-container{
height: 100%; height: 100%;
background: url('../images/login-bg.jpg') center no-repeat; background: url('../images/login-bg.jpg') center no-repeat;

30
src/main/webapp/static/mweixin/article.less
Unescape View File

@ -4,6 +4,7 @@
.ms-flex(); .ms-flex();
width: 100%; width: 100%;
background: transparent !important; background: transparent !important;
padding: 0 !important;
.el-container { .el-container {
// 侧边 // 侧边
.el-aside { .el-aside {
@ -115,22 +116,23 @@
.ms-main-body { .ms-main-body {
height: calc(~'100% - 180px'); height: calc(~'100% - 180px');
background: #fff; background: #fff;
.edui-editor { .edui-default{
height: 100%;
.edui-editor-toolbarboxouter {
background-color: none !important;
background-image: none !important;
} // 编辑器样式
.edui-editor { .edui-editor {
border: none !important; .edui-editor-toolbarboxouter {
.edui-editor-toolbarbox { background-color: none !important;
box-shadow: none !important; background-image: none !important;
.edui-editor-toolbarboxouter { } // 编辑器样式
background-color: transparent !important; .edui-editor {
background-image: none !important; border: none !important;
border: none !important; .edui-editor-toolbarbox {
border-radius: 0 !important;
box-shadow: none !important; 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;
}
} }
} }
} }

35
src/main/webapp/static/mweixin/css/article.css
Unescape View File

@ -50,7 +50,7 @@ input::-webkit-input-placeholder,
textarea::-webkit-input-placeholder { textarea::-webkit-input-placeholder {
font-weight: initial; font-weight: initial;
font-size: 12px; font-size: 12px;
color: #999; color: #aaa;
resize: none; resize: none;
} }
*::-webkit-scrollbar { *::-webkit-scrollbar {
@ -100,11 +100,27 @@ textarea::-webkit-input-placeholder {
.ms-weixin-content { .ms-weixin-content {
width: calc(100% - 140px); 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 { .ms-article {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
width: 100%; width: 100%;
background: transparent !important; background: transparent !important;
padding: 0 !important;
} }
.ms-article .el-container .el-aside { .ms-article .el-container .el-aside {
padding: 14px; padding: 14px;
@ -180,7 +196,7 @@ textarea::-webkit-input-placeholder {
.ms-article .el-container .el-aside .ms-article-footer .el-button span { .ms-article .el-container .el-aside .ms-article-footer .el-button span {
font-weight: initial; font-weight: initial;
font-size: 12px; font-size: 12px;
color: #999; color: #aaa;
} }
.ms-article .el-container .el-main { .ms-article .el-container .el-main {
flex: 1; 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 { .ms-article .el-container .el-main .ms-main-header .ms-pic-upload .el-upload span {
font-weight: initial; font-weight: initial;
font-size: 12px; font-size: 12px;
color: #999; color: #aaa;
margin-top: 4px; margin-top: 4px;
} }
.ms-article .el-container .el-main .ms-main-header .ms-pic-upload .el-upload i { .ms-article .el-container .el-main .ms-main-header .ms-pic-upload .el-upload i {
font-weight: initial; font-weight: initial;
font-size: 18px; font-size: 18px;
color: #999; color: #aaa;
} }
.ms-article .el-container .el-main .ms-main-header .el-form { .ms-article .el-container .el-main .ms-main-header .el-form {
flex: 1; flex: 1;
@ -241,20 +257,17 @@ textarea::-webkit-input-placeholder {
height: calc(100% - 180px); height: calc(100% - 180px);
background: #fff; background: #fff;
} }
.ms-article .el-container .el-main .ms-main-body .edui-editor { .ms-article .el-container .el-main .ms-main-body .edui-default .edui-editor .edui-editor-toolbarboxouter {
height: 100%;
}
.ms-article .el-container .el-main .ms-main-body .edui-editor .edui-editor-toolbarboxouter {
background-color: none !important; background-color: none !important;
background-image: 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; 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; 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-color: transparent !important;
background-image: none !important; background-image: none !important;
border: none !important; border: none !important;

49
src/main/webapp/static/mweixin/css/message-reply.css
Unescape View File

@ -50,7 +50,7 @@ input::-webkit-input-placeholder,
textarea::-webkit-input-placeholder { textarea::-webkit-input-placeholder {
font-weight: initial; font-weight: initial;
font-size: 12px; font-size: 12px;
color: #999; color: #aaa;
resize: none; resize: none;
} }
*::-webkit-scrollbar { *::-webkit-scrollbar {
@ -100,6 +100,21 @@ textarea::-webkit-input-placeholder {
.ms-weixin-content { .ms-weixin-content {
width: calc(100% - 140px); 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 { .ms-message-reply {
display: flex; display: flex;
justify-content: flex-start; justify-content: flex-start;
@ -112,63 +127,67 @@ textarea::-webkit-input-placeholder {
} }
.ms-message-reply .message-reply-tabs { .ms-message-reply .message-reply-tabs {
flex: 1; flex: 1;
border: 1px solid #ddd;
border-radius: 4px 4px 0 0 !important; border-radius: 4px 4px 0 0 !important;
border: none !important;
} }
.ms-message-reply .message-reply-tabs .el-tabs__header { .ms-message-reply .message-reply-tabs .el-tabs__header {
margin: 0 !important; margin: 0 !important;
} }
.ms-message-reply .message-reply-tabs .el-tabs__header .el-tabs__nav-scroll { .ms-message-reply .message-reply-tabs .el-tabs__header .el-tabs__nav-scroll {
padding: 0 20px; 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; padding: 0 !important;
width: 100%; width: 100%;
display: flex; display: flex;
justify-content: space-between; 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%; 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; 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; 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; position: absolute;
right: 5px; right: 5px;
bottom: 66px; bottom: 66px;
font-weight: initial; font-weight: initial;
font-size: 12px; 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; 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; height: 127px !important;
border: none !important; border: none !important;
border-bottom: 1px solid #ddd !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; height: 58px;
padding: 0 14px; padding: 0 14px;
display: flex; display: flex;
justify-content: flex-start; justify-content: flex-start;
align-items: center; 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; margin-right: 12px;
font-size: 16px; 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-weight: initial;
font-size: 14px; font-size: 14px;
color: #0099ff; 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-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-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 a:hover {
cursor: pointer; cursor: pointer;
} }

80
src/main/webapp/static/mweixin/message-reply.less
Unescape View File

@ -11,59 +11,63 @@
// 导航切换 // 导航切换
.message-reply-tabs{ .message-reply-tabs{
flex: 1; flex: 1;
border: 1px solid @borderColor;
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; // background: #f2f2f6;
margin: 0 !important; margin: 0 !important;
.el-tabs__nav-scroll{ .el-tabs__nav-scroll{
padding: 0 20px; padding: 0 20px;
border:1px solid @borderColor;
} }
} }
.el-tab-pane{ .el-tabs__content{
padding: 0 !important; border:1px solid @borderColor;
width: 100%; .el-tab-pane{
.ms-flex(); padding: 0 !important;
>.el-form{
width: 100%; width: 100%;
.ms-message-reply-content{ .ms-flex();
margin: 0; >.el-form{
.el-form-item__content{ width: 100%;
position: relative; .ms-message-reply-content{
.el-icon-delete{ margin: 0;
position: absolute; .el-form-item__content{
right: 5px; position: relative;
bottom: 66px; .el-icon-delete{
.ms-font(@auxiliarySize,@auxiliaryColor); position: absolute;
&:hover{ right: 5px;
cursor: pointer; bottom: 66px;
} .ms-font(@auxiliarySize,@auxiliaryColor);
}
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{ &:hover{
cursor: pointer; 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;
}
}
}
} }
}
}
} }
} }
} }

Write Preview
Loading…
Cancel
Save