Skip to content

C
cms_sys
Commit 2c6d2db1 authored by yinxr's avatar yinxr
Browse files
Options

Signed-off-by: 找回index.less文件，并修复logo样式问题

parent 27867d4e
Show whitespace changes
Inline Side-by-side
Showing with 485 additions and 87 deletions
src/main/webapp/WEB-INF/manager/include/head-file.ftl
View file @ 2c6d2db1
...@@ -35,19 +35,15 @@ ...@@ -35,19 +35,15 @@
<link rel="stylesheet" href="${base}/static/ms-admin/4.7.0/css/login.css"> <link rel="stylesheet" href="${base}/static/ms-admin/4.7.0/css/login.css">
<link rel="stylesheet" href="${base}/static/mweixin/css/custom-menu.css"> <link rel="stylesheet" href="${base}/static/mweixin/css/custom-menu.css">
<link rel="stylesheet" href="${base}/static/mweixin/css/message-reply.css"> <link rel="stylesheet" href="${base}/static/mweixin/css/message-reply.css">
<!--
<link rel="stylesheet" href="../../../static/ms-admin/4.7.0/css/login.css">
<link rel="stylesheet" href="../../../static/mweixin/css/custom-menu.css">
<link rel="stylesheet" href="../../../static/mweixin/css/message-reply.css">
-->
<script> <script>
ms.base = "${base}"; ms.base = "${base}";
ms.manager = "${managerPath}"; ms.manager = "${managerPath}";
// ms.base = "http://192.168.0.54:82"; // ms.base = "http://192.168.0.54:85";
// ms.manager = "http://192.168.0.54:82/apis/ms"; // ms.manager = "http://192.168.0.54:85/apis/ms";
// ms.web = "http://192.168.0.54:82/apis"; // ms.web = "http://192.168.0.54:85/apis";
//图片懒加载 //图片懒加载
Vue.use(VueLazyload, { Vue.use(VueLazyload, {
error: ms.base + '/images/ic_image_deault.png', error: ms.base + '/images/ic_image_deault.png',
......
src/main/webapp/WEB-INF/manager/index.ftl
View file @ 2c6d2db1
...@@ -6,10 +6,11 @@ ...@@ -6,10 +6,11 @@
<#include "/reset-password.ftl"/> <#include "/reset-password.ftl"/>
<#include "/exit-system.ftl"/> <#include "/exit-system.ftl"/>
<link rel="stylesheet" href="${base}/static/ms-admin/4.7.0/css/index.css"> <link rel="stylesheet" href="${base}/static/ms-admin/4.7.0/css/index.css">
<!--#include virtual="include/head-file.ftl" --> <!--#include virtual="include/head-file.ftl" -->
<!--#include virtual="./reset-password.ftl" --> <!-- #include virtual="./reset-password.ftl" -->
<!--#include virtual="./exit-system.ftl" --> <!--#include virtual="./exit-system.ftl" -->
<!--<link rel="stylesheet" href="../../../static/ms-admin/4.7.0/css/index.css">--> <link rel="stylesheet" href="../../../static/ms-admin/4.7.0/css/index.css">
</head> </head>
<body> <body>
......
src/main/webapp/WEB-INF/manager/login.ftl
View file @ 2c6d2db1
...@@ -3,11 +3,11 @@ ...@@ -3,11 +3,11 @@
<head> <head>
<title></title> <title></title>
<#include "/include/head-file.ftl"/> --> <#include "/include/head-file.ftl"/>
<link rel="stylesheet" href="${base}/static/ms-admin/4.7.0/css/login.css"> <link rel="stylesheet" href="${base}/static/ms-admin/4.7.0/css/login.css">
<!--#include virtual="include/head-file.ftl" --> <!--#include virtual="include/head-file.ftl" -->
<!-- <link rel="stylesheet" href="../../../static/ms-admin/4.7.0/css/login.css"> --> <link rel="stylesheet" href="../../../static/ms-admin/4.7.0/css/login.css">
</head> </head>
<body> <body>
...@@ -122,12 +122,12 @@ ...@@ -122,12 +122,12 @@
}) })
}, },
code: function() { code: function() {
this.verifCode = ms.manager + "/code?t=" + new Date().getTime(); this.verifCode = ms.web + "/code?t=" + new Date().getTime();
}, },
}, },
mounted: function() { mounted: function() {
this.verifCode = ms.manager + "/code?t=" + new Date().getTime() this.verifCode = ms.web + "/code?t=" + new Date().getTime()
} }
}) })
......
src/main/webapp/static/ms-admin/4.7.0/less/css/login.css → src/main/webapp/static/ms-admin/4.7.0/css/index.css
View file @ 2c6d2db1
...@@ -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: #aaa; color: #999;
resize: none; resize: none;
} }
*::-webkit-scrollbar { *::-webkit-scrollbar {
...@@ -68,7 +68,7 @@ textarea::-webkit-input-placeholder { ...@@ -68,7 +68,7 @@ textarea::-webkit-input-placeholder {
*::-webkit-scrollbar-thumb { *::-webkit-scrollbar-thumb {
border-radius: 10px; border-radius: 10px;
/*滚动条的圆角*/ /*滚动条的圆角*/
background-color: #ddd; background-color: #e6e6e6;
/*滚动条的背景颜色*/ /*滚动条的背景颜色*/
} }
.ms-container { .ms-container {
...@@ -104,7 +104,7 @@ textarea::-webkit-input-placeholder { ...@@ -104,7 +104,7 @@ textarea::-webkit-input-placeholder {
height: 55px; height: 55px;
box-sizing: border-box; box-sizing: border-box;
padding: 10px 10px 25px 10px; padding: 10px 10px 25px 10px;
border-bottom: 1px solid #ddd; border-bottom: 1px solid #e6e6e6;
} }
.ms-weixin-dialog .el-dialog__header .el-dialog__title { .ms-weixin-dialog .el-dialog__header .el-dialog__title {
font-weight: bold; font-weight: bold;
...@@ -112,7 +112,7 @@ textarea::-webkit-input-placeholder { ...@@ -112,7 +112,7 @@ textarea::-webkit-input-placeholder {
color: #333; color: #333;
} }
.ms-weixin-dialog .el-dialog__footer { .ms-weixin-dialog .el-dialog__footer {
border-top: 1px solid #ddd; border-top: 1px solid #e6e6e6;
padding: 15px !important; padding: 15px !important;
} }
.ms-hover { .ms-hover {
...@@ -123,99 +123,249 @@ textarea::-webkit-input-placeholder { ...@@ -123,99 +123,249 @@ textarea::-webkit-input-placeholder {
background: #fff; background: #fff;
border-color: #0099ff; border-color: #0099ff;
} }
.login { .index {
width: 100vw; width: 100%;
height: 100vh;
} }
.login .ms-admin-login-container { .ms-admin-header {
height: 100%; display: flex;
background: url('../images/login-bg.jpg') center no-repeat; padding: 0;
background-size: cover; background-color: #0099ff;
height: 50px !important;
}
.ms-admin-header .ms-admin-header-menu {
background-color: #0099ff;
width: auto;
border-bottom: none;
position: relative;
}
.ms-admin-header .ms-admin-header-menu > .ms-admin-menu-item > *,
.ms-admin-header .ms-admin-header-menu > .ms-admin-menu-item {
height: 50px !important;
line-height: 50px !important;
background-color: #0099ff !important;
color: rgba(255, 255, 255, 0.65) !important;
border-bottom: none !important;
font-size: 1em;
}
.ms-admin-header .ms-admin-header-menu > .ms-admin-menu-item > *:hover,
.ms-admin-header .ms-admin-header-menu > .ms-admin-menu-item:hover {
color: #fff !important;
}
.ms-admin-header .ms-admin-header-menu > .ms-admin-menu-item > *.is-active,
.ms-admin-header .ms-admin-header-menu > .ms-admin-menu-item.is-active {
color: #fff !important;
}
.ms-admin-header .ms-admin-header-menu .ms-admin-shortcut-menu {
user-select: none;
outline: none;
padding-left: 20px;
width: 100%;
min-width: 500px;
min-height: 200px;
background-color: #fff !important;
height: auto;
flex-wrap: wrap;
position: absolute;
right: 0;
top: 0;
z-index: 9;
background: #ffffff;
border: 1px solid #e6e6e6;
box-shadow: 2px 3px 5px 0.1px rgba(0, 0, 0, 0.1);
}
.ms-admin-header .ms-admin-header-menu .ms-admin-shortcut-menu > li {
margin: 0;
margin-right: 20px;
text-align: left;
display: -webkit-inline-box;
display: inline-block;
height: 50px;
line-height: 50px;
font-weight: normal;
font-size: 14px;
color: #333;
}
.ms-admin-header .ms-admin-header-menu .ms-admin-shortcut-menu > li:hover {
cursor: pointer;
color: #0099ff;
}
.ms-admin-header .ms-admin-header-menu .ms-admin-shortcut-menu i {
position: absolute;
top: 18px;
right: 19px;
font-weight: normal;
font-size: 14px;
color: #333;
}
.ms-admin-header .ms-admin-header-menu .ms-admin-shortcut-menu i:hover {
cursor: pointer;
} }
.login .ms-admin-login-container .ms-admin-login-main { .ms-admin-logo {
min-width: 200px;
width: 200px;
display: flex;
align-items: center;
overflow: hidden;
}
.ms-admin-logo > img {
padding: 20px 0 20px 20px;
width: 80px;
}
.ms-admin-logo > div {
display: flex;
align-items: center;
}
.ms-admin-logo > div img {
margin-top: -10px;
margin-left: 3px;
}
.ms-admin-logo > div span {
margin-top: -7px;
position: absolute;
margin-left: 6px;
font-size: 12px;
}
.ms-admin-logo .iconfont {
color: #fff;
margin-left: auto;
margin-right: 20px;
cursor: pointer;
}
.ms-admin-mstore {
margin-left: auto;
min-width: 200px;
display: flex; display: flex;
justify-content: center;
align-items: center; align-items: center;
justify-content: flex-end;
padding: 0;
} }
.login .ms-admin-login-container .ms-admin-login-main .ms-admin-login-warp { .ms-admin-mstore .ms-admin-mstore-icon {
min-width: 50px;
width: 50px;
height: 50px;
background-color: #0080FF;
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
width: 680px; cursor: pointer;
height: 320px;
} }
.login .ms-admin-login-container .ms-admin-login-main .ms-admin-login-warp > img { .ms-admin-mstore .ms-admin-mstore-icon .iconfont {
flex: 1; color: #fff;
display: inline-block;
} }
.login .ms-admin-login-container .ms-admin-login-main .ms-admin-login-warp .ms-admin-login-form { .ms-admin-login {
flex: 1; display: flex;
height: 320px; align-items: center;
}
.ms-admin-login > span {
width: 120px;
padding: 0 20px;
height: 50px;
display: flex;
align-items: center;
cursor: pointer;
outline: none;
}
.ms-admin-login > span img {
border-radius: 50%;
width: 20px;
height: 20px;
margin-right: 8px;
}
.ms-admin-login > span span {
color: #fff;
}
.ms-admin-login .active {
background: #fff; background: #fff;
padding: 39px 54px;
} }
.login .ms-admin-login-container .ms-admin-login-main .ms-admin-login-warp .ms-admin-login-form h1 { .ms-admin-login .active span {
line-height: 1; color: #333;
font-weight: initial; }
font-size: 12px; .ms-admin-login-down {
color: #999999; width: 120px;
margin: 0 0 30px 0; border: none;
margin: 0 !important;
padding: 0 !important;
border-radius: 0;
box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.1);
}
.ms-admin-login-down > .popper__arrow {
display: none;
}
.ms-admin-menu-aside {
width: 200px !important;
overflow: visible;
}
.ms-admin-menu-aside .ms-admin-menu {
width: 200px;
height: 100%;
position: relative;
} }
.login .ms-admin-login-container .ms-admin-login-main .ms-admin-login-warp .ms-admin-login-form h1 span { .ms-admin-menu-aside .ms-admin-menu .el-menu--inline .is-active {
border-left: 2px solid #0099ff;
}
.ms-admin-menu-aside .ms-admin-menu .ms-menu-expand {
transform: rotate(270deg);
position: absolute;
right: -34px;
top: 50%;
cursor: pointer;
}
.ms-admin-menu-aside .ms-admin-menu .ms-menu-expand i {
font-weight: initial; font-weight: initial;
font-size: 16px; font-size: 14px;
color: #0099ff; color: #333;
position: absolute;
transform: rotate(90deg);
top: 5px;
right: 43%;
}
.ms-admin-menu-aside .ms-admin-menu .ms-menu-expand::before {
border-color: transparent transparent #eee;
border-style: none solid solid;
border-width: 0 30px 22px;
content: "";
display: block;
height: 0;
left: -10px;
width: 30px;
} }
.login .ms-admin-login-container .ms-admin-login-main .ms-admin-login-warp .ms-admin-login-form .ms-admin-form-item { .ms-admin-menu-aside .ms-admin-menu .ms-menu-expand-active {
margin-bottom: 12px; transform: rotate(90deg);
transition: all .3 ease;
right: -56px;
} }
.login .ms-admin-login-container .ms-admin-login-main .ms-admin-login-warp .ms-admin-login-form .ms-admin-form-item > div { .ms-admin-menu-aside .ms-admin-menu-active {
margin-left: 0 !important; width: 60px;
height: 100%;
} }
.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, .ms-admin-menu-aside-active {
.login .ms-admin-login-container .ms-admin-login-main .ms-admin-login-warp .ms-admin-login-form .ms-admin-form-item .el-input, width: 60px !important;
.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 { .ms-admin-container {
display: flex; height: calc(100vh - 60px);
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, .ms-admin-container > .ms-admin-main {
.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 { padding: 0;
width: 110px; background-color: #fff;
} }
.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 { .ms-admin-container > .ms-admin-main .ms-admin-tabs {
width: 66px; height: 100%;
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 { .ms-admin-container > .ms-admin-main .ms-admin-tabs .el-tabs__content {
display: flex; height: 100%;
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) { .ms-admin-container > .ms-admin-main .ms-admin-tabs .el-tabs__content .el-tab-pane {
font-weight: initial; height: 100%;
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) { .ms-admin-container > .ms-admin-main .ms-admin-tabs .el-tabs__nav-scroll {
font-weight: initial; background: #fafafa;
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, .ms-admin-container > .ms-admin-main .ms-admin-tabs .el-tabs__nav-scroll .el-tabs__nav {
.login .ms-admin-login-container .ms-admin-login-main .ms-admin-login-warp .ms-admin-login-form .ms-admin-form-item-checkout .el-input, border-left: none;
.login .ms-admin-login-container .ms-admin-login-main .ms-admin-login-warp .ms-admin-login-form .ms-admin-form-item-checkout input { border-radius: 0;
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 { .ms-admin-container > .ms-admin-main iframe {
width: 100%; width: 100%;
height: 34px; height: 100%;
line-height: 5px; border: none !important;
} }
src/main/webapp/static/ms-admin/4.7.0/less/index.less 0 → 100644
View file @ 2c6d2db1
// 首页样式
@import "app.less";
//头部
.index{
width: 100%;
}
.ms-admin-header {
display: flex;
padding: 0;
background-color: @themeColor;
height: @headHeight !important;
//头部menu
.ms-admin-header-menu {
background-color: @themeColor;
width: auto;
border-bottom: none;
position: relative;
&>.ms-admin-menu-item>*,
&>.ms-admin-menu-item {
.ms-line-height(@headHeight) !important;
background-color: @themeColor !important;
color: rgba(255, 255, 255, 0.65) !important;
border-bottom: none !important;
font-size: 1em;
&:hover {
color: #fff !important;
}
&.is-active {
color: #fff !important;
}
}
// 快捷菜单
.ms-admin-shortcut-menu{
user-select: none;
outline: none;
padding-left: 20px;
width: 100%;
min-width: 500px;
min-height: 200px;
background-color:#fff !important;
height: auto;
flex-wrap: wrap;
position: absolute;
right: 0;
top: 0;
z-index: 9;
background: #ffffff;
border:1px solid @borderColor;
box-shadow: 2px 3px 5px 0.1px rgba(0,0,0,.1);
>li{
margin: 0;
// min-width: 100px;
// text-align: center;
margin-right: 20px;
text-align: left;
display: -webkit-inline-box;
display: inline-block;
.ms-line-height(50px);
.ms-font(@defalutSize, @defalutColor, normal);
&:hover{
cursor: pointer;
color: @themeColor;
}
}
// 更多图标
i{
position: absolute;
top: 18px;
right: 19px;
.ms-font(@defalutSize, @defalutColor, normal);
&:hover{
cursor: pointer;
}
}
}
}
}
//logo
.ms-admin-logo {
min-width: 200px;
width: 200px;
.ms-align-center;
overflow: hidden;
&>img {
padding: @listPadding 0 @listPadding 20px;
width: 80px;
}
&>div {
.ms-align-center;
img {
margin-top: -10px;
margin-left: 3px;
}
span {
margin-top: -7px;
position: absolute;
margin-left: 6px;
font-size: 12px;
}
}
.iconfont {
color: #fff;
margin-left: auto;
margin-right: @listPadding;
cursor: pointer;
}
}
//头部右侧mstore
.ms-admin-mstore {
margin-left: auto;
min-width: 200px;
.ms-align-center;
justify-content: flex-end;
padding: 0;
.ms-admin-mstore-icon {
min-width: @headHeight;
.ms-width-height(@headHeight);
background-color: #0080FF;
.ms-flex(center);
align-items: center;
cursor: pointer;
.iconfont {
color: #fff;
}
}
}
//头部登录
.ms-admin-login {
.ms-align-center;
&>span {
width: 120px;
padding: 0 20px;
height: @headHeight;
.ms-align-center;
cursor: pointer;
outline: none;
img {
border-radius: 50%;
.ms-width-height(20px);
margin-right: 8px;
}
span {
color: #fff;
}
}
.active {
background: #fff;
span {
color: @titleColor;
}
}
}
//下拉菜单
.ms-admin-login-down {
width: 120px;
border: none;
.ms-margin-padding(0) !important;
border-radius: 0;
box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.1);
&>.popper__arrow {
display: none;
}
}
//左侧菜单
.ms-admin-menu-aside{
width: 200px !important;
overflow: visible;
.ms-admin-menu {
.ms-width-height(200px, 100%);
position: relative;
.el-menu--inline {
.is-active {
border-left: 2px solid @themeColor;
}
}
// 左侧收缩按钮
.ms-menu-expand{
transform: rotate(270deg);
position: absolute;
right: -34px;
top: 50%;
cursor: pointer;
// 收缩
i{
.ms-font(14px,#333);
position: absolute;
transform: rotate(90deg);
top: 5px;
right: 43%;
}
&::before{
border-color: transparent transparent #eee;
border-style: none solid solid;
border-width: 0 30px 22px;
content: "";
display: block;
height: 0;
left: -10px;
width: 30px;
}
}
.ms-menu-expand-active{
transform: rotate(90deg);
transition: all .3 ease;
right: -56px;
}
}
// 激活状态
.ms-admin-menu-active{
.ms-width-height(60px, 100%);
}
}
.ms-admin-menu-aside-active{
width: 60px !important;
}
//身体
.ms-admin-container {
height: ~'calc(100vh - 60px)';
&>.ms-admin-main {
padding: 0;
background-color: #fff;
//选项卡
.ms-admin-tabs {
height: 100%;
.el-tabs__content{
height: 100%;
.el-tab-pane{
height: 100%;
}
}
.el-tabs__nav-scroll {
background: #fafafa;
.el-tabs__nav {
border-left: none;
border-radius: 0;
}
}
}
// 嵌套iframe
iframe{
.ms-width-height(100%);
border: none !important;
}
}
}
\ No newline at end of file
Markdown is supported
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