Skip to content
GitLab
Commit 178009f4 authored by sunxin's avatar sunxin
Browse files

Merge branch '4.7.0' of https://gitee.com/sunxinone/MCMS.git into 4.7.0

parents 7fbb94f5 28f9a324
Hide whitespace changes
Inline Side-by-side
src/main/webapp/static/mweixin/article.less
View file @ 178009f4
......@@ -5,13 +5,22 @@
width: 100%;
background: transparent !important;
padding: 0 !important;
.ms-article-mask {
background: #000;
opacity: .2;
.ms-width-height(100%, 146px);
position: absolute;
top: 0;
left: 0;
// 主图文章
.ms-main-article{
&:hover{
cursor: pointer;
}
.ms-article-mask {
background: #000;
opacity: .2;
.ms-width-height(100%, 146px);
position: absolute;
top: 0;
left: 0;
&:hover{
cursor: pointer;
}
}
}
.el-container {
.ms-container {
......@@ -32,9 +41,10 @@
span {
position: absolute;
bottom: 0;
padding: 15px;
margin: 15px;
color: #fff;
.ms-ellipsis-clamp(2);
word-break: break-all;//数字单词的情况
}
} // 子文章
.ms-article-item {
......@@ -42,6 +52,7 @@
.ms-flex();
padding: 10px 0;
border-bottom: 1px solid @borderColor;
position: relative;
p {
margin: 0 10px 0 0;
.ms-flex();
......@@ -55,9 +66,34 @@
img {
.ms-width-height(50px);
}
// 遮罩
.ms-article-item-mask{
visibility: hidden;
background: rgb(126, 126, 126);
opacity: .8;
.ms-width-height(100%,50%);
position: absolute;
bottom:0;
.ms-flex(flex-end);
align-items: center;
>i{
.ms-font(14px,#fff);
margin:0 10px 0 auto;
display: none;
}
}
&:hover {
cursor: pointer;
}
&:hover{
.ms-article-item-mask{
visibility: visible;
>i{
display: block;
}
}
}
} // 尾部
.ms-article-footer {
background: #fff;
......@@ -86,7 +122,7 @@
box-sizing: border-box;
border-bottom: 1px solid @borderColor; // 图片上传
.ms-pic-upload {
.ms-width-height(140px);
.ms-width-height(140px,100%);
border-radius: 4px;
border: 1px dashed @borderColor;
.ms-flex(center);
......@@ -135,18 +171,34 @@
padding-right: 50px !important;
}
}
// 标题输入框预留边距
.basic-title-input{
>.el-input__inner{
padding-right:54px !important;
}
}
}
.el-form-item:last-child{
padding-top: 4px;
}
}
}
.ms-main-body {
height: calc(~'100% - 180px');
background: #fff;
.edui-editor-toolbarbox{
border: none !important;
box-shadow: none !important;
}
.edui-default {
border: none;
// 设置edui-default的class样式会导致选择工具栏会出现抖动，是因为这个class类是通用样式
.edui-editor {
border: none !important;
.edui-editor-toolbarboxouter {
background-color: none !important;
background-image: none !important;
box-shadow: none !important;
border-bottom: none !important;
} // 编辑器样式
.edui-editor {
border: none !important;
......@@ -163,6 +215,9 @@
}
}
}
.edui-editor-toolbarboxinner{
background: #fff;
}
}
}
}
......
src/main/webapp/static/mweixin/css/app.css 0 → 100644
View file @ 178009f4
/*
*这里的值严格按照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: #999;
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: #e6e6e6;
/*滚动条的背景颜色*/
}
.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 #e6e6e6;
}
.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 #e6e6e6;
padding: 15px !important;
}
.ms-hover {
cursor: pointer;
}
.ms-hover:hover {
color: #0099ff;
background: #fff;
border-color: #0099ff;
}
.ms-header-select {
font-size: 0;
}
.ms-header-select > .el-select:nth-of-type(2) {
margin: 0 10px;
}
.el-submenu .el-menu-item.is-active {
border-radius: 4px;
}
.el-card,
.el-message {
border-radius: 0 !important;
}
src/main/webapp/static/mweixin/css/article.css
View file @ 178009f4
......@@ -123,6 +123,19 @@ textarea::-webkit-input-placeholder {
background: #fff;
border-color: #0099ff;
}
.ms-header-select {
font-size: 0;
}
.ms-header-select > .el-select:nth-of-type(2) {
margin: 0 10px;
}
.el-submenu .el-menu-item.is-active {
border-radius: 4px;
}
.el-card,
.el-message {
border-radius: 0 !important;
}
.ms-article {
display: flex;
justify-content: space-between;
......@@ -130,7 +143,10 @@ textarea::-webkit-input-placeholder {
background: transparent !important;
padding: 0 !important;
}
.ms-article .ms-article-mask {
.ms-article .ms-main-article:hover {
cursor: pointer;
}
.ms-article .ms-main-article .ms-article-mask {
background: #000;
opacity: .2;
width: 100%;
......@@ -139,6 +155,9 @@ textarea::-webkit-input-placeholder {
top: 0;
left: 0;
}
.ms-article .ms-main-article .ms-article-mask:hover {
cursor: pointer;
}
.ms-article .el-container .ms-container {
padding: 0;
background: transparent;
......@@ -158,13 +177,14 @@ textarea::-webkit-input-placeholder {
.ms-article .el-container .el-aside .ms-main-article span {
position: absolute;
bottom: 0;
padding: 15px;
margin: 15px;
color: #fff;
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 2;
-webkit-box-orient: vertical;
word-break: break-all;
}
.ms-article .el-container .el-aside .ms-article-item {
width: 100%;
......@@ -173,6 +193,7 @@ textarea::-webkit-input-placeholder {
justify-content: space-between;
padding: 10px 0;
border-bottom: 1px solid #e6e6e6;
position: relative;
}
.ms-article .el-container .el-aside .ms-article-item p {
margin: 0 10px 0 0;
......@@ -193,9 +214,34 @@ textarea::-webkit-input-placeholder {
width: 50px;
height: 50px;
}
.ms-article .el-container .el-aside .ms-article-item .ms-article-item-mask {
visibility: hidden;
background: #7e7e7e;
opacity: .8;
width: 100%;
height: 50%;
position: absolute;
bottom: 0;
display: flex;
justify-content: flex-end;
align-items: center;
}
.ms-article .el-container .el-aside .ms-article-item .ms-article-item-mask > i {
font-weight: initial;
font-size: 14px;
color: #fff;
margin: 0 10px 0 auto;
display: none;
}
.ms-article .el-container .el-aside .ms-article-item:hover {
cursor: pointer;
}
.ms-article .el-container .el-aside .ms-article-item:hover .ms-article-item-mask {
visibility: visible;
}
.ms-article .el-container .el-aside .ms-article-item:hover .ms-article-item-mask > i {
display: block;
}
.ms-article .el-container .el-aside .ms-article-footer {
background: #fff;
padding-top: 20px;
......@@ -228,7 +274,7 @@ textarea::-webkit-input-placeholder {
}
.ms-article .el-container .el-main .ms-main-header .ms-pic-upload {
width: 140px;
height: 140px;
height: 100%;
border-radius: 4px;
border: 1px dashed #e6e6e6;
display: flex;
......@@ -289,16 +335,28 @@ textarea::-webkit-input-placeholder {
.ms-article .el-container .el-main .ms-main-header .el-form .el-form-item .el-input__suffix > input {
padding-right: 50px !important;
}
.ms-article .el-container .el-main .ms-main-header .el-form .el-form-item .basic-title-input > .el-input__inner {
padding-right: 54px !important;
}
.ms-article .el-container .el-main .ms-main-header .el-form .el-form-item:last-child {
padding-top: 4px;
}
.ms-article .el-container .el-main .ms-main-body {
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-editor-toolbarbox {
border: none !important;
box-shadow: none !important;
}
.ms-article .el-container .el-main .ms-main-body .edui-default .edui-editor {
border: none !important;
}
.ms-article .el-container .el-main .ms-main-body .edui-default .edui-editor .edui-editor-toolbarboxouter {
background-color: none !important;
background-image: none !important;
box-shadow: none !important;
border-bottom: none !important;
}
.ms-article .el-container .el-main .ms-main-body .edui-default .edui-editor .edui-editor {
border: none !important;
......@@ -313,3 +371,6 @@ textarea::-webkit-input-placeholder {
border-radius: 0 !important;
box-shadow: none !important;
}
.ms-article .el-container .el-main .ms-main-body .edui-editor-toolbarboxinner {
background: #fff;
}
src/main/webapp/static/mweixin/css/custom-menu.css
View file @ 178009f4
......@@ -50,7 +50,7 @@ input::-webkit-input-placeholder,
textarea::-webkit-input-placeholder {
font-weight: initial;
font-size: 12px;
color: #aaa;
color: #999;
resize: none;
}
*::-webkit-scrollbar {
......@@ -68,13 +68,13 @@ textarea::-webkit-input-placeholder {
*::-webkit-scrollbar-thumb {
border-radius: 10px;
/*滚动条的圆角*/
background-color: #ddd;
background-color: #e6e6e6;
/*滚动条的背景颜色*/
}
.ms-container {
margin: 12px;
height: calc(100% - 24px);
padding: 14px 14px 0 14px;
padding: 14px;
background: #fff;
}
.ms-header {
......@@ -104,7 +104,7 @@ textarea::-webkit-input-placeholder {
height: 55px;
box-sizing: border-box;
padding: 10px 10px 25px 10px;
border-bottom: 1px solid #ddd;
border-bottom: 1px solid #e6e6e6;
}
.ms-weixin-dialog .el-dialog__header .el-dialog__title {
font-weight: bold;
......@@ -112,7 +112,7 @@ textarea::-webkit-input-placeholder {
color: #333;
}
.ms-weixin-dialog .el-dialog__footer {
border-top: 1px solid #ddd;
border-top: 1px solid #e6e6e6;
padding: 15px !important;
}
.ms-hover {
......@@ -123,6 +123,18 @@ textarea::-webkit-input-placeholder {
background: #fff;
border-color: #0099ff;
}
.ms-header-select {
font-size: 0;
}
.ms-header-select > .el-select:nth-of-type(2) {
margin: 0 10px;
}
.el-submenu {
margin: 0 12px;
}
.el-submenu .el-menu-item.is-active {
border-radius: 4px;
}
.ms-custom-menu {
color: #f2f2f6;
}
......@@ -139,6 +151,9 @@ textarea::-webkit-input-placeholder {
width: 280px !important;
height: 470px !important;
}
.ms-custom-menu .ms-custom-container .el-aside .el-container {
overflow: hidden;
}
.ms-custom-menu .ms-custom-container .el-aside .el-container .el-header {
height: 40px !important;
line-height: 40px !important;
......@@ -151,7 +166,7 @@ textarea::-webkit-input-placeholder {
.ms-custom-menu .ms-custom-container .el-aside .el-container .el-main {
padding: 0;
width: 280px !important;
height: 379px !important;
height: 380px !important;
}
.ms-custom-menu .ms-custom-container .el-aside .el-container .el-footer {
white-space: nowrap;
......@@ -162,14 +177,15 @@ textarea::-webkit-input-placeholder {
height: 50px !important;
display: flex;
justify-content: flex-start;
border-top: 1px solid #ddd !important;
border-top: 1px solid #e6e6e6 !important;
}
.ms-custom-menu .ms-custom-container .el-aside .el-container .el-footer > .el-button {
width: 40px !important;
height: 50px !important;
min-width: 40px;
padding: 0 !important;
border: none !important;
border-right: 1px solid #ddd !important;
border-right: 1px solid #e6e6e6 !important;
}
.ms-custom-menu .ms-custom-container .el-aside .el-container .el-footer .el-button {
border-radius: 0 !important;
......@@ -177,7 +193,7 @@ textarea::-webkit-input-placeholder {
background: transparent !important;
}
.ms-custom-menu .ms-custom-container .el-aside .el-container .el-footer .ms-create-menu {
flex: 1;
width: 240px;
font-size: 0;
display: flex;
justify-content: space-between;
......@@ -196,16 +212,41 @@ textarea::-webkit-input-placeholder {
}
.ms-custom-menu .ms-custom-container .el-aside .el-container .el-footer .ms-create-menu .ms-create-sub-menu > .el-button:first-child {
width: 100%;
border-right: 1px solid #e6e6e6 !important;
padding: 10px !important;
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 1;
-webkit-box-orient: vertical;
}
.ms-custom-menu .ms-custom-container .el-aside .el-container .el-footer .ms-create-menu .ms-create-sub-menu > .el-button:last-child {
.ms-custom-menu .ms-custom-container .el-aside .el-container .el-footer .ms-create-menu .ms-create-sub-menu .sub-menu-list {
position: absolute;
top: -60px;
bottom: 60px;
left: 0;
border: 1px solid #ddd !important;
border: 1px solid #e6e6e6 !important;
width: 100%;
display: flex;
justify-content: flex-start;
flex-direction: column;
}
.ms-custom-menu .ms-custom-container .el-aside .el-container .el-footer .ms-create-menu .ms-create-sub-menu .sub-menu-list > button {
margin-left: 0 !important;
border: none !important;
border-bottom: 1px solid #e6e6e6 !important;
}
.ms-custom-menu .ms-custom-container .el-aside .el-container .el-footer .ms-create-menu .ms-create-sub-menu .sub-menu-list .ms-create-btn {
border-bottom: none !important;
}
.ms-custom-menu .ms-custom-container .el-aside .el-container .el-footer .ms-create-menu .ms-create-sub-menu .sub-menu-list .sub-menu-item {
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 1;
-webkit-box-orient: vertical;
padding: 10px !important;
}
.ms-custom-menu .ms-custom-container .el-aside .el-container .el-footer .ms-create-menu .el-button--default {
border-left: 1px solid #ddd !important;
padding: 0 !important;
flex: 1;
}
......@@ -218,22 +259,29 @@ textarea::-webkit-input-placeholder {
.ms-custom-menu .ms-custom-container .el-main .custom-menu-card {
height: 100%;
}
.ms-custom-menu .ms-custom-container .el-main .custom-menu-card .ms-custom-menu-name .el-form-item__content {
.ms-custom-menu .ms-custom-container .el-main .custom-menu-card .ms-custom-menu-name .el-form-item__content,
.ms-custom-menu .ms-custom-container .el-main .custom-menu-card .ms-custom-menu-content .el-form-item__content {
display: flex;
justify-content: flex-start;
}
.ms-custom-menu .ms-custom-container .el-main .custom-menu-card .ms-custom-menu-name .el-form-item__content .el-input {
.ms-custom-menu .ms-custom-container .el-main .custom-menu-card .ms-custom-menu-name .el-form-item__content .el-input,
.ms-custom-menu .ms-custom-container .el-main .custom-menu-card .ms-custom-menu-content .el-form-item__content .el-input {
width: 153px !important;
height: 30px !important;
}
.ms-custom-menu .ms-custom-container .el-main .custom-menu-card .ms-custom-menu-name .el-form-item__content span {
.ms-custom-menu .ms-custom-container .el-main .custom-menu-card .ms-custom-menu-name .el-form-item__content span,
.ms-custom-menu .ms-custom-container .el-main .custom-menu-card .ms-custom-menu-content .el-form-item__content span {
margin-left: 10px;
font-weight: initial;
font-size: 12px;
color: #aaa;
color: #999;
}
.ms-custom-menu .ms-custom-container .el-main .custom-menu-card .ms-custom-menu-content .el-form-item__content .el-input {
width: 306px !important;
height: 30px !important;
}
.ms-custom-menu .ms-custom-container .el-main .custom-menu-card .ms-custom-menu-content .el-tabs {
border: 1px solid #ddd;
border: 1px solid #e6e6e6;
}
.ms-custom-menu .ms-custom-container .el-main .custom-menu-card .ms-custom-menu-content .el-tabs .el-tabs__header {
background: #f2f2f6;
......@@ -255,7 +303,7 @@ textarea::-webkit-input-placeholder {
}
.ms-custom-menu .ms-custom-container .el-main .custom-menu-card .ms-custom-menu-content .el-tabs .el-tab-pane > div {
flex: 1;
border: 1px dashed #ddd;
border: 1px dashed #e6e6e6;
display: flex;
justify-content: center;
align-items: center;
......
src/main/webapp/static/mweixin/css/material-bank-form.css
View file @ 178009f4
......@@ -50,7 +50,7 @@ input::-webkit-input-placeholder,
textarea::-webkit-input-placeholder {
font-weight: initial;
font-size: 12px;
color: #aaa;
color: #999;
resize: none;
}
*::-webkit-scrollbar {
......@@ -68,7 +68,7 @@ textarea::-webkit-input-placeholder {
*::-webkit-scrollbar-thumb {
border-radius: 10px;
/*滚动条的圆角*/
background-color: #ddd;
background-color: #e6e6e6;
/*滚动条的背景颜色*/
}
.ms-container {
......@@ -104,7 +104,7 @@ textarea::-webkit-input-placeholder {
height: 55px;
box-sizing: border-box;
padding: 10px 10px 25px 10px;
border-bottom: 1px solid #ddd;
border-bottom: 1px solid #e6e6e6;
}
.ms-weixin-dialog .el-dialog__header .el-dialog__title {
font-weight: bold;
......@@ -112,7 +112,7 @@ textarea::-webkit-input-placeholder {
color: #333;
}
.ms-weixin-dialog .el-dialog__footer {
border-top: 1px solid #ddd;
border-top: 1px solid #e6e6e6;
padding: 15px !important;
}
.ms-hover {
......@@ -123,6 +123,19 @@ textarea::-webkit-input-placeholder {
background: #fff;
border-color: #0099ff;
}
.ms-header-select {
font-size: 0;
}
.ms-header-select > .el-select:nth-of-type(2) {
margin: 0 10px;
}
.el-submenu .el-menu-item.is-active {
border-radius: 4px;
}
.el-card,
.el-message {
border-radius: 0 !important;
}
.material-bank-form > .el-dialog__wrapper > .el-dialog {
width: 895px !important;
height: 587px !important;
......@@ -143,6 +156,13 @@ textarea::-webkit-input-placeholder {
.material-bank-form > .el-dialog__wrapper > .el-dialog > .el-dialog__body > .el-tabs .el-tabs__header .el-tabs__nav-scroll {
padding: 20px 10px;
}
.material-bank-form > .el-dialog__wrapper > .el-dialog > .el-dialog__body > .el-tabs .el-tabs__header .el-tabs__nav-scroll .el-tabs__nav .el-tabs__active-bar {
background-color: transparent !important;
}
.material-bank-form > .el-dialog__wrapper > .el-dialog > .el-dialog__body > .el-tabs .el-tabs__header .el-tabs__nav-scroll .el-tabs__nav .is-active {
color: #409EFF !important;
background-color: #ecf5ff;
}
.material-bank-form > .el-dialog__wrapper > .el-dialog > .el-dialog__body > .el-tabs .el-tabs__header .el-tabs__nav-wrap::after {
width: 1px !important;
}
......@@ -161,7 +181,6 @@ textarea::-webkit-input-placeholder {
flex: 1;
}
.material-bank-form > .el-dialog__wrapper > .el-dialog > .el-dialog__body > .el-tabs .is-active {
background-color: #e9eaf0;
font-weight: initial;
font-size: 14px;
color: #333;
......
src/main/webapp/static/mweixin/css/material-list.css
View file @ 178009f4
......@@ -123,6 +123,12 @@ textarea::-webkit-input-placeholder {
background: #fff;
border-color: #0099ff;
}
.ms-header-select {
font-size: 0;
}
.ms-header-select > .el-select:nth-of-type(2) {
margin: 0 10px;
}
.ms-weixin-content .ms-header > .el-select--small:first-child {
width: 100px !important;
}
......
src/main/webapp/static/mweixin/css/menu.css
View file @ 178009f4
......@@ -50,7 +50,7 @@ input::-webkit-input-placeholder,
textarea::-webkit-input-placeholder {
font-weight: initial;
font-size: 12px;
color: #aaa;
color: #999;
resize: none;
}
*::-webkit-scrollbar {
......@@ -68,7 +68,7 @@ textarea::-webkit-input-placeholder {
*::-webkit-scrollbar-thumb {
border-radius: 10px;
/*滚动条的圆角*/
background-color: #ddd;
background-color: #e6e6e6;
/*滚动条的背景颜色*/
}
.ms-container {
......@@ -104,7 +104,7 @@ textarea::-webkit-input-placeholder {
height: 55px;
box-sizing: border-box;
padding: 10px 10px 25px 10px;
border-bottom: 1px solid #ddd;
border-bottom: 1px solid #e6e6e6;
}
.ms-weixin-dialog .el-dialog__header .el-dialog__title {
font-weight: bold;
......@@ -112,7 +112,7 @@ textarea::-webkit-input-placeholder {
color: #333;
}
.ms-weixin-dialog .el-dialog__footer {
border-top: 1px solid #ddd;
border-top: 1px solid #e6e6e6;
padding: 15px !important;
}
.ms-hover {
......@@ -123,6 +123,19 @@ textarea::-webkit-input-placeholder {
background: #fff;
border-color: #0099ff;
}
.ms-header-select {
font-size: 0;
}
.ms-header-select > .el-select:nth-of-type(2) {
margin: 0 10px;
}
.el-submenu .el-menu-item.is-active {
border-radius: 4px;
}
.el-card,
.el-message {
border-radius: 0 !important;
}
.ms-admin-menu {
min-height: 100vh;
min-width: 140px;
......
src/main/webapp/static/mweixin/css/message-reply.css
View file @ 178009f4
......@@ -50,7 +50,7 @@ input::-webkit-input-placeholder,
textarea::-webkit-input-placeholder {
font-weight: initial;
font-size: 12px;
color: #aaa;
color: #999;
resize: none;
}
*::-webkit-scrollbar {
......@@ -68,7 +68,7 @@ textarea::-webkit-input-placeholder {
*::-webkit-scrollbar-thumb {
border-radius: 10px;
/*滚动条的圆角*/
background-color: #ddd;
background-color: #e6e6e6;
/*滚动条的背景颜色*/
}
.ms-container {
......@@ -104,7 +104,7 @@ textarea::-webkit-input-placeholder {
height: 55px;
box-sizing: border-box;
padding: 10px 10px 25px 10px;
border-bottom: 1px solid #ddd;
border-bottom: 1px solid #e6e6e6;
}
.ms-weixin-dialog .el-dialog__header .el-dialog__title {
font-weight: bold;
......@@ -112,7 +112,7 @@ textarea::-webkit-input-placeholder {
color: #333;
}
.ms-weixin-dialog .el-dialog__footer {
border-top: 1px solid #ddd;
border-top: 1px solid #e6e6e6;
padding: 15px !important;
}
.ms-hover {
......@@ -125,6 +125,7 @@ textarea::-webkit-input-placeholder {
}
.ms-admin-message-reply .ms-container {
display: flex;
height: 256px;
}
.ms-admin-message-reply .ms-container .message-reply-tabs {
padding-left: 12px;
......@@ -148,10 +149,11 @@ textarea::-webkit-input-placeholder {
}
.ms-message-reply .message-reply-tabs .el-tabs__header .el-tabs__nav-scroll {
padding: 0 20px;
border: 1px solid #ddd;
border: 1px solid #e6e6e6;
}
.ms-message-reply .message-reply-tabs .el-tabs__content {
border: 1px solid #ddd;
border: 1px solid #e6e6e6;
height: calc(100% - 42px);
}
.ms-message-reply .message-reply-tabs .el-tabs__content .el-tab-pane {
padding: 0 !important;
......@@ -174,7 +176,7 @@ textarea::-webkit-input-placeholder {
bottom: 66px;
font-weight: initial;
font-size: 12px;
color: #aaa;
color: #999;
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 {
......@@ -185,7 +187,7 @@ 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 textarea {
height: 127px !important;
border: none !important;
border-bottom: 1px solid #ddd !important;
border-bottom: 1px solid #e6e6e6 !important;
}
.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;
......@@ -213,3 +215,36 @@ 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 a:hover {
cursor: pointer;
}
.ms-message-reply .message-reply-tabs .el-tabs__content .message-reply-picture,
.ms-message-reply .message-reply-tabs .el-tabs__content .message-reply-article {
padding: 20px !important;
height: 100%;
}
.ms-message-reply .message-reply-tabs .el-tabs__content .message-reply-picture > div,
.ms-message-reply .message-reply-tabs .el-tabs__content .message-reply-article > div {
flex: 1;
border: 1px dashed #e6e6e6;
display: flex;
justify-content: center;
align-items: center;
flex-direction: column;
}
.ms-message-reply .message-reply-tabs .el-tabs__content .message-reply-picture > div i,
.ms-message-reply .message-reply-tabs .el-tabs__content .message-reply-article > div i {
font-weight: bolder;
font-size: 20px;
color: #0099ff;
}
.ms-message-reply .message-reply-tabs .el-tabs__content .message-reply-picture > div span,
.ms-message-reply .message-reply-tabs .el-tabs__content .message-reply-article > div span {
margin-top: 8px;
line-height: 1;
}
.ms-message-reply .message-reply-tabs .el-tabs__content .message-reply-picture > div:hover,
.ms-message-reply .message-reply-tabs .el-tabs__content .message-reply-article > div:hover {
cursor: pointer;
}
.ms-message-reply .message-reply-tabs .el-tabs__content .message-reply-picture > div:last-child,
.ms-message-reply .message-reply-tabs .el-tabs__content .message-reply-article > div:last-child {
margin-left: 20px;
}
src/main/webapp/static/mweixin/css/new-pic-form.css
View file @ 178009f4
......@@ -50,7 +50,7 @@ input::-webkit-input-placeholder,
textarea::-webkit-input-placeholder {
font-weight: initial;
font-size: 12px;
color: #aaa;
color: #999;
resize: none;
}
*::-webkit-scrollbar {
......@@ -68,7 +68,7 @@ textarea::-webkit-input-placeholder {
*::-webkit-scrollbar-thumb {
border-radius: 10px;
/*滚动条的圆角*/
background-color: #ddd;
background-color: #e6e6e6;
/*滚动条的背景颜色*/
}
.ms-container {
......@@ -104,7 +104,7 @@ textarea::-webkit-input-placeholder {
height: 55px;
box-sizing: border-box;
padding: 10px 10px 25px 10px;
border-bottom: 1px solid #ddd;
border-bottom: 1px solid #e6e6e6;
}
.ms-weixin-dialog .el-dialog__header .el-dialog__title {
font-weight: bold;
......@@ -112,7 +112,7 @@ textarea::-webkit-input-placeholder {
color: #333;
}
.ms-weixin-dialog .el-dialog__footer {
border-top: 1px solid #ddd;
border-top: 1px solid #e6e6e6;
padding: 15px !important;
}
.ms-hover {
......@@ -131,7 +131,7 @@ textarea::-webkit-input-placeholder {
line-height: 1;
font-weight: initial;
font-size: 12px;
color: #aaa;
color: #999;
}
.new-pic-form dt {
display: inline-block;
......
src/main/webapp/static/mweixin/css/picture-list.css
View file @ 178009f4
......@@ -50,7 +50,7 @@ input::-webkit-input-placeholder,
textarea::-webkit-input-placeholder {
font-weight: initial;
font-size: 12px;
color: #aaa;
color: #999;
resize: none;
}
*::-webkit-scrollbar {
......@@ -68,13 +68,13 @@ textarea::-webkit-input-placeholder {
*::-webkit-scrollbar-thumb {
border-radius: 10px;
/*滚动条的圆角*/
background-color: #ddd;
background-color: #e6e6e6;
/*滚动条的背景颜色*/
}
.ms-container {
margin: 12px;
height: calc(100% - 24px);
padding: 14px 14px 0 14px;
padding: 14px;
background: #fff;
}
.ms-header {
......@@ -104,7 +104,7 @@ textarea::-webkit-input-placeholder {
height: 55px;
box-sizing: border-box;
padding: 10px 10px 25px 10px;
border-bottom: 1px solid #ddd;
border-bottom: 1px solid #e6e6e6;
}
.ms-weixin-dialog .el-dialog__header .el-dialog__title {
font-weight: bold;
......@@ -112,7 +112,7 @@ textarea::-webkit-input-placeholder {
color: #333;
}
.ms-weixin-dialog .el-dialog__footer {
border-top: 1px solid #ddd;
border-top: 1px solid #e6e6e6;
padding: 15px !important;
}
.ms-hover {
......@@ -123,6 +123,12 @@ textarea::-webkit-input-placeholder {
background: #fff;
border-color: #0099ff;
}
.ms-header-select {
font-size: 0;
}
.ms-header-select > .el-select:nth-of-type(2) {
margin: 0 10px;
}
.ms-admin-picture {
height: 100%;
}
......@@ -179,7 +185,7 @@ textarea::-webkit-input-placeholder {
padding: 14px 0;
}
.ms-admin-picture-list .ms-admin-picture-item > div .footer i {
color: #999;
color: #333;
margin: auto;
cursor: pointer;
}
......
src/main/webapp/static/mweixin/custom-menu.less
View file @ 178009f4
......@@ -14,6 +14,7 @@
.ms-width-height(280px, 470px) !important;
// 微信界面
.el-container {
overflow: hidden;
// 头部
.el-header {
.ms-line-height(40px) !important;
......@@ -23,7 +24,7 @@
}
.el-main {
padding: 0;
.ms-width-height(280px, 379px) !important;
.ms-width-height(280px, 380px) !important;
}
.el-footer {
white-space: nowrap;
......@@ -35,6 +36,7 @@
border-top: 1px solid @borderColor !important;
>.el-button {
.ms-width-height(40px, 50px) !important;
min-width: 40px;
padding: 0 !important;
border: none !important;
border-right: 1px solid @borderColor !important;
......@@ -45,7 +47,7 @@
background: transparent !important;
}
.ms-create-menu {
flex: 1;
width: 240px;
font-size: 0;
.ms-flex(space-between);
.el-button {
......@@ -59,20 +61,39 @@
.ms-create-sub-menu {
flex: 1;
position: relative;
// 主菜单
>.el-button:first-child {
width: 100%;
border-right:1px solid @borderColor !important;
padding: 10px !important;
.ms-ellipsis-clamp(1);
}
>.el-button:last-child {
// 添加子菜单
.sub-menu-list{
position: absolute;
top: -60px;
bottom:60px;
left: 0;
border: 1px solid @borderColor !important;
width: 100%;
.ms-flex(flex-start);
flex-direction: column;
>button{
margin-left: 0 !important;
border: none !important;
border-bottom: 1px solid @borderColor !important;
}
.ms-create-btn{
border-bottom: none !important;
}
// 子菜单列表
.sub-menu-item{
.ms-ellipsis-clamp(1);
padding:10px !important;
}
}
}
// 添加菜单
.el-button--default {
border-left: 1px solid @borderColor !important;
padding: 0 !important;
flex: 1;
}
......@@ -90,7 +111,7 @@
.custom-menu-card {
height: 100%;
// 内容菜单表单
.ms-custom-menu-name {
.ms-custom-menu-name,.ms-custom-menu-content {
.el-form-item__content {
.el-input {
.ms-width-height(153px, 30px) !important;
......@@ -102,6 +123,13 @@
}
}
}
.ms-custom-menu-content {
.el-form-item__content {
.el-input {
.ms-width-height(306px, 30px) !important;
}
}
}
// 菜单内容
.ms-custom-menu-content {
.el-tabs {
......
src/main/webapp/static/mweixin/material-bank-form.less
View file @ 178009f4
......@@ -16,6 +16,16 @@
margin: 0 !important;
.el-tabs__nav-scroll{
padding:20px 10px;
.el-tabs__nav{
// 取消 激活状态边框
.el-tabs__active-bar{
background-color:transparent !important;
}
.is-active{
color: #409EFF !important;
background-color: #ecf5ff;
}
}
}
.el-tabs__nav-wrap::after{
width: 1px !important;
......@@ -38,7 +48,6 @@
}
// tab选中的样式
.is-active{
background-color:rgb(233, 234, 240);
.ms-font(@defalutSize,@defalutColor);
}
}
......
src/main/webapp/static/mweixin/menu.less
View file @ 178009f4
......@@ -31,6 +31,19 @@
min-width: 140px;
width: 140px;
}
// .ms-admin-submenu{
// .el-submenu__title{
// height: 40px !important;
// .ms-flex();
// align-items: center;
// }
// }
// // 菜单列表
// .ms-admin-menu-menu-item{
// height: 40px;
// .ms-flex();
// align-items: center;
// }
}
.ms-admin-material-item {
min-width: 100% !important;
......
src/main/webapp/static/mweixin/message-reply.less
View file @ 178009f4
......@@ -2,6 +2,7 @@
.ms-admin-message-reply {
.ms-container {
display: flex;
height: 256px;
.message-reply-tabs {
padding-left: 12px;
}
......@@ -31,10 +32,12 @@
}
.el-tabs__content {
border: 1px solid @borderColor;
height: calc(~'100% - 42px');
.el-tab-pane {
padding: 0 !important;
width: 100%;
.ms-flex();
// 文字回复
>.el-form {
width: 100%;
.ms-message-reply-content {
......@@ -53,6 +56,7 @@
border: none !important;
border-bottom: 1px solid @borderColor !important;
}
// 底部插入超链接
.footer {
height: 58px;
padding: 0 14px;
......@@ -77,6 +81,35 @@
}
}
}
// 图片回复
.message-reply-picture,.message-reply-article{
padding:20px !important;
height: 100%;
>div {
flex: 1;
border: 1px dashed @borderColor;
.ms-flex(center);
align-items: center;
flex-direction: column;
i {
.ms-font(20px, @themeColor, bolder);
}
span {
margin-top: 8px;
line-height: 1;
}
&:hover {
cursor: pointer;
}
}
>div:last-child {
margin-left: 20px;
}
}
// 图文回复
.message-reply-article{
}
}
}
}
\ No newline at end of file
src/main/webapp/static/mweixin/new-pic-form.less
View file @ 178009f4
......@@ -11,5 +11,5 @@
dt{
display: inline-block;
margin-bottom: 8px;
}
}
}
\ No newline at end of file
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment