"jshERP-web/src/views/git@ustchcs.com:gujinli1118/JSH_ERP.git" did not exist on "2e00975d53ba92c8a0dd4ebc0a9bdaaa8933fb69"
Commit 352235a1 authored by a123456's avatar a123456
Browse files

Signed-off-by: a123456 <1209165801@qq.com>

parent a16292b8
...@@ -50,7 +50,7 @@ input::-webkit-input-placeholder, ...@@ -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 {
...@@ -74,7 +74,7 @@ textarea::-webkit-input-placeholder { ...@@ -74,7 +74,7 @@ textarea::-webkit-input-placeholder {
.ms-container { .ms-container {
margin: 12px; margin: 12px;
height: calc(100% - 24px); height: calc(100% - 24px);
padding: 14px 14px 0 14px; padding: 14px;
background: #fff; background: #fff;
} }
.ms-header { .ms-header {
...@@ -84,6 +84,9 @@ textarea::-webkit-input-placeholder { ...@@ -84,6 +84,9 @@ textarea::-webkit-input-placeholder {
background: #fff; background: #fff;
height: 50px; height: 50px;
} }
.ms-header button {
height: 30px;
}
.ms-pagination { .ms-pagination {
padding: 20px 0; padding: 20px 0;
text-align: right; text-align: right;
...@@ -94,9 +97,6 @@ textarea::-webkit-input-placeholder { ...@@ -94,9 +97,6 @@ textarea::-webkit-input-placeholder {
.ms-tr { .ms-tr {
text-align: right; text-align: right;
} }
.el-button + .el-button {
margin-left: 0;
}
.ms-weixin-content { .ms-weixin-content {
width: calc(100% - 140px); width: calc(100% - 140px);
} }
...@@ -115,6 +115,14 @@ textarea::-webkit-input-placeholder { ...@@ -115,6 +115,14 @@ textarea::-webkit-input-placeholder {
border-top: 1px solid #ddd; border-top: 1px solid #ddd;
padding: 15px !important; 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 { .material-bank-form > .el-dialog__wrapper > .el-dialog {
width: 895px !important; width: 895px !important;
height: 587px !important; height: 587px !important;
......
...@@ -84,6 +84,9 @@ textarea::-webkit-input-placeholder { ...@@ -84,6 +84,9 @@ textarea::-webkit-input-placeholder {
background: #fff; background: #fff;
height: 50px; height: 50px;
} }
.ms-header button {
height: 30px;
}
.ms-pagination { .ms-pagination {
padding: 20px 0; padding: 20px 0;
text-align: right; text-align: right;
...@@ -94,12 +97,32 @@ textarea::-webkit-input-placeholder { ...@@ -94,12 +97,32 @@ textarea::-webkit-input-placeholder {
.ms-tr { .ms-tr {
text-align: right; text-align: right;
} }
.el-button + .el-button {
margin-left: 0;
}
.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-hover {
cursor: pointer;
}
.ms-hover:hover {
color: #0099ff;
background: #fff;
border-color: #0099ff;
}
.ms-admin-material-list { .ms-admin-material-list {
background: #fff; background: #fff;
margin: 12px; margin: 12px;
...@@ -133,11 +156,17 @@ textarea::-webkit-input-placeholder { ...@@ -133,11 +156,17 @@ textarea::-webkit-input-placeholder {
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap; white-space: nowrap;
display: block; 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 { .ms-admin-material-list .ms-admin-material-item .body img {
width: 170px; width: 170px;
height: 110px; height: 110px;
margin: 0.5em auto; margin: 0 auto;
object-fit: cover; object-fit: cover;
} }
.ms-admin-material-list .ms-admin-material-item .body p { .ms-admin-material-list .ms-admin-material-item .body p {
...@@ -158,6 +187,11 @@ textarea::-webkit-input-placeholder { ...@@ -158,6 +187,11 @@ textarea::-webkit-input-placeholder {
margin: auto; margin: auto;
cursor: pointer; 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 { .ms-admin-material-list .ms-admin-material-item .footer em {
width: 1px; width: 1px;
height: 1em; height: 1em;
......
...@@ -50,7 +50,7 @@ input::-webkit-input-placeholder, ...@@ -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 {
...@@ -74,7 +74,7 @@ textarea::-webkit-input-placeholder { ...@@ -74,7 +74,7 @@ textarea::-webkit-input-placeholder {
.ms-container { .ms-container {
margin: 12px; margin: 12px;
height: calc(100% - 24px); height: calc(100% - 24px);
padding: 14px 14px 0 14px; padding: 14px;
background: #fff; background: #fff;
} }
.ms-header { .ms-header {
...@@ -84,6 +84,9 @@ textarea::-webkit-input-placeholder { ...@@ -84,6 +84,9 @@ textarea::-webkit-input-placeholder {
background: #fff; background: #fff;
height: 50px; height: 50px;
} }
.ms-header button {
height: 30px;
}
.ms-pagination { .ms-pagination {
padding: 20px 0; padding: 20px 0;
text-align: right; text-align: right;
...@@ -94,12 +97,32 @@ textarea::-webkit-input-placeholder { ...@@ -94,12 +97,32 @@ textarea::-webkit-input-placeholder {
.ms-tr { .ms-tr {
text-align: right; text-align: right;
} }
.el-button + .el-button {
margin-left: 0;
}
.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-hover {
cursor: pointer;
}
.ms-hover:hover {
color: #0099ff;
background: #fff;
border-color: #0099ff;
}
.ms-admin-menu { .ms-admin-menu {
min-height: 100vh; min-height: 100vh;
min-width: 140px; min-width: 140px;
...@@ -133,6 +156,10 @@ textarea::-webkit-input-placeholder { ...@@ -133,6 +156,10 @@ textarea::-webkit-input-placeholder {
min-height: calc(100vh - 50px); min-height: calc(100vh - 50px);
background: #fff; 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 { .ms-admin-menu .el-main .ms-admin-material-item {
min-width: 100% !important; min-width: 100% !important;
} }
...@@ -74,7 +74,7 @@ textarea::-webkit-input-placeholder { ...@@ -74,7 +74,7 @@ textarea::-webkit-input-placeholder {
.ms-container { .ms-container {
margin: 12px; margin: 12px;
height: calc(100% - 24px); height: calc(100% - 24px);
padding: 14px 14px 0 14px; padding: 14px;
background: #fff; background: #fff;
} }
.ms-header { .ms-header {
...@@ -84,6 +84,9 @@ textarea::-webkit-input-placeholder { ...@@ -84,6 +84,9 @@ textarea::-webkit-input-placeholder {
background: #fff; background: #fff;
height: 50px; height: 50px;
} }
.ms-header button {
height: 30px;
}
.ms-pagination { .ms-pagination {
padding: 20px 0; padding: 20px 0;
text-align: right; text-align: right;
...@@ -94,9 +97,6 @@ textarea::-webkit-input-placeholder { ...@@ -94,9 +97,6 @@ textarea::-webkit-input-placeholder {
.ms-tr { .ms-tr {
text-align: right; text-align: right;
} }
.el-button + .el-button {
margin-left: 0;
}
.ms-weixin-content { .ms-weixin-content {
width: calc(100% - 140px); width: calc(100% - 140px);
} }
...@@ -115,11 +115,24 @@ textarea::-webkit-input-placeholder { ...@@ -115,11 +115,24 @@ textarea::-webkit-input-placeholder {
border-top: 1px solid #ddd; border-top: 1px solid #ddd;
padding: 15px !important; 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 { .ms-message-reply {
display: flex; display: flex;
justify-content: flex-start; justify-content: flex-start;
padding: 20px; height: auto;
height: 267px;
} }
.ms-message-reply > div:first-child { .ms-message-reply > div:first-child {
margin-right: 10px; margin-right: 10px;
...@@ -157,14 +170,17 @@ textarea::-webkit-input-placeholder { ...@@ -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 { .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: 7px;
bottom: 66px; bottom: 66px;
font-weight: initial; font-weight: initial;
font-size: 12px; font-size: 12px;
color: #aaa; 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 { .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 { .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;
...@@ -181,6 +197,12 @@ textarea::-webkit-input-placeholder { ...@@ -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 { .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;
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 { .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;
......
...@@ -50,7 +50,7 @@ input::-webkit-input-placeholder, ...@@ -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 {
...@@ -74,7 +74,7 @@ textarea::-webkit-input-placeholder { ...@@ -74,7 +74,7 @@ textarea::-webkit-input-placeholder {
.ms-container { .ms-container {
margin: 12px; margin: 12px;
height: calc(100% - 24px); height: calc(100% - 24px);
padding: 14px 14px 0 14px; padding: 14px;
background: #fff; background: #fff;
} }
.ms-header { .ms-header {
...@@ -84,6 +84,9 @@ textarea::-webkit-input-placeholder { ...@@ -84,6 +84,9 @@ textarea::-webkit-input-placeholder {
background: #fff; background: #fff;
height: 50px; height: 50px;
} }
.ms-header button {
height: 30px;
}
.ms-pagination { .ms-pagination {
padding: 20px 0; padding: 20px 0;
text-align: right; text-align: right;
...@@ -94,9 +97,6 @@ textarea::-webkit-input-placeholder { ...@@ -94,9 +97,6 @@ textarea::-webkit-input-placeholder {
.ms-tr { .ms-tr {
text-align: right; text-align: right;
} }
.el-button + .el-button {
margin-left: 0;
}
.ms-weixin-content { .ms-weixin-content {
width: calc(100% - 140px); width: calc(100% - 140px);
} }
...@@ -115,6 +115,14 @@ textarea::-webkit-input-placeholder { ...@@ -115,6 +115,14 @@ textarea::-webkit-input-placeholder {
border-top: 1px solid #ddd; border-top: 1px solid #ddd;
padding: 15px !important; padding: 15px !important;
} }
.ms-hover {
cursor: pointer;
}
.ms-hover:hover {
color: #0099ff;
background: #fff;
border-color: #0099ff;
}
.new-pic-form dl { .new-pic-form dl {
margin: 0; margin: 0;
} }
...@@ -123,7 +131,7 @@ textarea::-webkit-input-placeholder { ...@@ -123,7 +131,7 @@ textarea::-webkit-input-placeholder {
line-height: 1; line-height: 1;
font-weight: initial; font-weight: initial;
font-size: 12px; font-size: 12px;
color: #999; color: #aaa;
} }
.new-pic-form dt { .new-pic-form dt {
display: inline-block; display: inline-block;
......
...@@ -84,6 +84,9 @@ textarea::-webkit-input-placeholder { ...@@ -84,6 +84,9 @@ textarea::-webkit-input-placeholder {
background: #fff; background: #fff;
height: 50px; height: 50px;
} }
.ms-header button {
height: 30px;
}
.ms-pagination { .ms-pagination {
padding: 20px 0; padding: 20px 0;
text-align: right; text-align: right;
...@@ -94,9 +97,6 @@ textarea::-webkit-input-placeholder { ...@@ -94,9 +97,6 @@ textarea::-webkit-input-placeholder {
.ms-tr { .ms-tr {
text-align: right; text-align: right;
} }
.el-button + .el-button {
margin-left: 0;
}
.ms-weixin-content { .ms-weixin-content {
width: calc(100% - 140px); width: calc(100% - 140px);
} }
...@@ -115,14 +115,30 @@ textarea::-webkit-input-placeholder { ...@@ -115,14 +115,30 @@ textarea::-webkit-input-placeholder {
border-top: 1px solid #ddd; border-top: 1px solid #ddd;
padding: 15px !important; 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 { .ms-admin-picture-list {
background: #fff; background: #fff;
margin: 12px; margin: 12px;
padding: 14px; padding: 14px;
display: flex; display: flex;
flex-wrap: wrap;
} }
.ms-admin-picture-list .ms-admin-picture-item { .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; margin: 0 24px 0 0;
padding: 10px 10px 0 10px; padding: 10px 10px 0 10px;
width: 230px; width: 230px;
...@@ -131,38 +147,94 @@ textarea::-webkit-input-placeholder { ...@@ -131,38 +147,94 @@ textarea::-webkit-input-placeholder {
border: 1px solid #e6e6e6; border: 1px solid #e6e6e6;
border-radius: 4px; border-radius: 4px;
} }
.ms-admin-picture-list .ms-admin-picture-item .body { .ms-admin-picture-list .ms-admin-picture-item > div .body {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
line-height: 2em; 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; margin-top: 0.5em;
display: flex; display: flex;
align-items: center; 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; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap; white-space: nowrap;
display: block; 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%; width: 100%;
height: 110px; height: 130px;
object-fit: cover; object-fit: cover;
} }
.ms-admin-picture-list .ms-admin-picture-item .footer { .ms-admin-picture-list .ms-admin-picture-item > div .footer {
display: flex; display: flex;
padding: 14px 0; 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; color: #999;
margin: auto; margin: auto;
cursor: pointer; 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; width: 1px;
height: 1em; height: 1em;
background: #e6e6e6; 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;
}
@import "../ms-admin/4.7.0/less/app.less"; @import "../ms-admin/4.7.0/less/app.less";
// 自定义菜单 // 自定义菜单
.ms-custom-menu{ .ms-custom-menu {
color: rgb(242, 242, 246); color: rgb(242, 242, 246);
.ms-custom-container{ .ms-custom-container {
margin: 10px;
.ms-flex(); .ms-flex();
&>.ms-container{
padding: 0;
background: transparent;
}
// 侧边 // 侧边
.el-aside{ .el-aside {
background: #fff; 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-line-height(40px) !important;
.ms-font(16px,#fff); .ms-font(16px, #fff);
text-align: center; text-align: center;
background: #323232; background: #323232;
} }
.el-main{ .el-main {
padding: 0; padding: 0;
.ms-width-height(280px,379px) !important; .ms-width-height(280px, 379px) !important;
} }
.el-footer{ .el-footer {
white-space: nowrap; white-space: nowrap;
padding: 0; padding: 0;
font-size: 0; font-size: 0;
background-color: #FAFAFA; background-color: #FAFAFA;
.ms-width-height(280px,50px) !important; .ms-width-height(280px, 50px) !important;
.ms-flex(flex-start); .ms-flex(flex-start);
border-top: 1px solid @borderColor !important; border-top: 1px solid @borderColor !important;
>.el-button{ >.el-button {
.ms-width-height(40px,50px) !important; .ms-width-height(40px, 50px) !important;
padding:0 !important; padding: 0 !important;
border: none !important; border: none !important;
border-right: 1px solid @borderColor !important; border-right: 1px solid @borderColor !important;
} }
.el-button{ .el-button {
border-radius: 0 !important; border-radius: 0 !important;
height:50px !important; height: 50px !important;
background: transparent !important; background: transparent !important;
} }
.ms-create-menu{ .ms-create-menu {
flex: 1; flex: 1;
font-size: 0; font-size: 0;
.ms-flex(space-between); .ms-flex(space-between);
.el-button{ .el-button {
flex: 1; flex: 1;
border: none !important; border: none !important;
background: transparent !important; background: transparent !important;
span{ span {
color:#333; color: #333;
} }
} }
.ms-create-sub-menu{ .ms-create-sub-menu {
flex: 1; flex: 1;
position: relative; position: relative;
>.el-button:first-child{ >.el-button:first-child {
width:100%; width: 100%;
} }
>.el-button:last-child{ >.el-button:last-child {
position: absolute; position: absolute;
top: -60px; top: -60px;
left: 0; left: 0;
border: 1px solid @borderColor !important; border: 1px solid @borderColor !important;
width: 100%; width: 100%;
} }
} }
// 添加菜单 // 添加菜单
.el-button--default{ .el-button--default {
border-left: 1px solid @borderColor !important; border-left: 1px solid @borderColor !important;
padding:0 !important; padding: 0 !important;
flex: 1; flex: 1;
} }
} }
} }
} }
} }
// 内容 // 内容
.el-main{ .el-main {
padding: 0; padding: 0;
padding-left: 20px; padding-left: 20px;
flex: 1; flex: 1;
height: 470px; height: 470px;
// 内容区域卡片 // 内容区域卡片
.custom-menu-card{ .custom-menu-card {
height: 100%; height: 100%;
// 内容菜单表单 // 内容菜单表单
.ms-custom-menu-name{ .ms-custom-menu-name {
.el-form-item__content{ .el-form-item__content {
.el-input{ .el-input {
.ms-width-height(153px,30px) !important; .ms-width-height(153px, 30px) !important;
} }
.ms-flex(flex-start); .ms-flex(flex-start);
span{ span {
margin-left: 10px; margin-left: 10px;
.ms-font(@auxiliarySize,@auxiliaryColor); .ms-font(@auxiliarySize, @auxiliaryColor);
} }
} }
} }
// 菜单内容 // 菜单内容
.ms-custom-menu-content{ .ms-custom-menu-content {
.el-tabs{ .el-tabs {
border: 1px solid @borderColor; border: 1px solid @borderColor;
.el-tabs__header{ .el-tabs__header {
background: #f2f2f6; background: #f2f2f6;
border-radius:4px 4px 0 0 !important; border-radius: 4px 4px 0 0 !important;
margin: 0 !important; margin: 0 !important;
.el-tabs__nav-scroll{ .el-tabs__nav-scroll {
padding: 0 20px; padding: 0 20px;
i{ i {
margin-right: 8px; margin-right: 8px;
} }
} }
} }
.el-tab-pane{ .el-tab-pane {
padding: 20px; padding: 20px;
.ms-width-height(100%,220px); .ms-width-height(100%, 220px);
.ms-flex(); .ms-flex();
// 素材库 // 素材库
>div{ >div {
flex: 1; flex: 1;
border: 1px dashed @borderColor; border: 1px dashed @borderColor;
.ms-flex(center); .ms-flex(center);
align-items: center; align-items: center;
flex-direction: column; flex-direction: column;
i{ i {
.ms-font(20px,@themeColor,bolder); .ms-font(20px, @themeColor, bolder);
} }
span{ span {
margin-top:8px; margin-top: 8px;
line-height: 1; line-height: 1;
} }
&:hover{ &:hover {
cursor: pointer; cursor: pointer;
} }
} }
>div:last-child{ >div:last-child {
margin-left:20px; margin-left: 20px;
} }
} }
} }
......
@import "../ms-admin/4.7.0/less/app.less"; @import "../ms-admin/4.7.0/less/app.less";
// 关键字列表 \ No newline at end of file
.keyword-list{
padding:14px;
}
\ No newline at end of file
@import "../ms-admin/4.7.0/less/app.less"; @import "../ms-admin/4.7.0/less/app.less";
// 关键字回复 // 关键字回复
.keyword-reply { .keyword-reply {
padding-bottom:20px; padding-bottom: 20px;
.el-select .el-input { .el-select .el-input {
width: 90px; width: 90px;
>input { >input {
padding: 0 10px !important; padding: 0 10px !important;
} }
} }
// 关键词 // 关键词
.ms-keyword-input{ .ms-keyword-input {
margin-bottom: 15px !important; margin-bottom: 15px !important;
// 尾词 // 尾词
.el-input__suffix{ .el-input__suffix {
line-height: 28px; line-height: 28px;
} }
// 添加 // 添加
.el-icon-plus{ .el-icon-plus {
margin-left:20px; margin-left: 20px;
.ms-font(@defalutSize,@themeColor,bold); .ms-font(@defalutSize, @themeColor, bold);
&:hover{ &:hover {
cursor: pointer; cursor: pointer;
} }
} }
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
textarea { textarea {
height: 127px !important; height: 127px !important;
border: none !important; border: none !important;
border-bottom: 1px solid @borderColor !important; border-bottom: 1px solid @borderColor !important;
} }
.footer { .footer {
height: 58px; height: 58px;
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
>.el-dialog__body{ >.el-dialog__body{
.ms-width-height(100%,469px) !important; .ms-width-height(100%,469px) !important;
padding:0 !important; padding:0 !important;
>.el-tabs{ >.el-tabs{
height: 100%; height: 100%;
// 侧边导航 // 侧边导航
.el-tabs__header{ .el-tabs__header{
......
...@@ -25,10 +25,11 @@ ...@@ -25,10 +25,11 @@
line-height: 2em; line-height: 2em;
span { span {
.ms-ellipsis; .ms-ellipsis;
.ms-hover;
} }
img { img {
.ms-width-height(170px, 110px); .ms-width-height(170px, 110px);
margin: 0.5em auto; margin: 0 auto;
object-fit: cover; object-fit: cover;
} }
p { p {
...@@ -43,7 +44,7 @@ ...@@ -43,7 +44,7 @@
i { i {
color: @contentColor; color: @contentColor;
margin: auto; margin: auto;
cursor: pointer; .ms-hover;
} }
em { em {
.ms-width-height(1px, 1em); .ms-width-height(1px, 1em);
......
...@@ -27,6 +27,10 @@ ...@@ -27,6 +27,10 @@
.ms-admin-menu-menu { .ms-admin-menu-menu {
min-height: ~'calc(100vh - 50px)'; min-height: ~'calc(100vh - 50px)';
background: #fff; background: #fff;
.el-menu-item{
min-width: 140px;
width: 140px;
}
} }
.ms-admin-material-item { .ms-admin-material-item {
min-width: 100% !important; min-width: 100% !important;
......
@import "../ms-admin/4.7.0/less/app.less"; @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); .ms-flex(flex-start);
padding:20px; height: auto;
height: 267px; >div:first-child {
>div:first-child{ margin-right: 10px;
margin-right:10px; line-height: 40px;
line-height: 40px;
} }
// 导航切换 // 导航切换
.message-reply-tabs{ .message-reply-tabs {
flex: 1; flex: 1;
border-radius:4px 4px 0 0 !important; border-radius: 4px 4px 0 0 !important;
border: none !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; border: 1px solid @borderColor;
} }
} }
.el-tabs__content{ .el-tabs__content {
border:1px solid @borderColor; border: 1px solid @borderColor;
.el-tab-pane{ .el-tab-pane {
padding: 0 !important; padding: 0 !important;
width: 100%; width: 100%;
.ms-flex(); .ms-flex();
>.el-form{ >.el-form {
width: 100%; width: 100%;
.ms-message-reply-content{ .ms-message-reply-content {
margin: 0; margin: 0;
.el-form-item__content{ .el-form-item__content {
position: relative; position: relative;
.el-icon-delete{ .el-icon-delete {
position: absolute; position: absolute;
right: 5px; right: 7px;
bottom: 66px; bottom: 66px;
.ms-font(@auxiliarySize,@auxiliaryColor); .ms-font(@auxiliarySize, @auxiliaryColor);
&:hover{ .ms-hover;
cursor: pointer;
}
} }
textarea{ textarea {
height: 127px !important; height: 127px !important;
border: none !important; border: none !important;
border-bottom: 1px solid @borderColor !important; border-bottom: 1px solid @borderColor !important;
} }
.footer{ .footer {
height: 58px; height: 58px;
padding: 0 14px; padding: 0 14px;
.ms-flex(flex-start); .ms-flex(flex-start);
align-items: center; align-items: center;
i{ i {
margin-right: 12px; margin-right: 12px;
font-size: 16px; font-size: 16px;
.ms-hover;
} }
a{ a {
.ms-font(@defalutSize,@themeColor); .ms-font(@defalutSize, @themeColor);
} }
i,a{ i,
&:hover{ a {
&:hover {
cursor: pointer; cursor: pointer;
} }
} }
} }
} }
} }
} }
} }
......
...@@ -11,5 +11,5 @@ ...@@ -11,5 +11,5 @@
dt{ dt{
display: inline-block; display: inline-block;
margin-bottom: 8px; margin-bottom: 8px;
} }
} }
\ No newline at end of file
@import "../ms-admin/4.7.0/less/app.less"; @import "../ms-admin/4.7.0/less/app.less";
.ms-admin-picture {
height: 100%;
}
//图片列表
.ms-admin-picture-list { .ms-admin-picture-list {
background: #fff; background: #fff;
.ms-margin-padding(12px, 14px); .ms-margin-padding(12px, 14px);
display: flex; display: flex;
flex-wrap: wrap;
//单个素材 //单个素材
.ms-admin-picture-item { .ms-admin-picture-item {
.ms-margin-padding(0 24px 0 0, 10px 10px 0 10px);
width: 230px;
display: flex; display: flex;
flex-direction: column; flex-wrap: wrap;
border: 1px solid #e6e6e6; align-items: flex-start;
border-radius: 4px; width: ~'calc(100% - 220px)' !important;
.body { &>div {
.ms-margin-padding(0 24px 0 0, 10px 10px 0 10px);
width: 230px;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
line-height: 2em; border: 1px solid #e6e6e6;
div { border-radius: 4px;
margin-top: 0.5em; .body {
display: flex; display: flex;
align-items: center; flex-direction: column;
span { line-height: 2em;
.ms-ellipsis; 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 { .footer {
.ms-width-height(100%, 110px); display: flex;
object-fit: cover; 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; display: flex;
padding: 14px 0; background: #f2f2f6;
font-weight: bold;
}
&>div {
.ms-align-center;
padding: 10px;
font-size: 14px;
span {
margin-right: auto;
}
i { i {
color: @contentColor; .ms-hover;
margin: auto; margin-left: 10px;
cursor: pointer; cursor: pointer;
} }
em { }
.ms-width-height(1px, 1em); &>p {
background: #e6e6e6; margin: 0;
} padding: 10px;
border: 1px solid #e6e6e6;
.ms-flex(center);
align-items: center;
.ms-hover;
} }
} }
} }
\ 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