Commit c4748ecb authored by 张伯涛's avatar 张伯涛

整体框架样式修改

parent 4d0cb192
...@@ -36,6 +36,7 @@ export default { ...@@ -36,6 +36,7 @@ export default {
vertical-align: middle; vertical-align: middle;
width: 20px; width: 20px;
height: 20px; height: 20px;
fill: white;
} }
.hamburger.is-active { .hamburger.is-active {
......
...@@ -25,7 +25,7 @@ export default { ...@@ -25,7 +25,7 @@ export default {
data() { data() {
return { return {
title: '诺兰特(北京)', title: '诺兰特(北京)',
logo: require('@/assets/image/loginLogo.png') logo: require('@/assets/image/nltLogo.png')
} }
} }
} }
...@@ -47,18 +47,19 @@ export default { ...@@ -47,18 +47,19 @@ export default {
width: 100%; width: 100%;
height: 50px; height: 50px;
line-height: 50px; line-height: 50px;
background: $menuBg; background: #FFFFFF;
padding-left: 11px; //padding-left: 11px;
overflow: hidden; overflow: hidden;
& .sidebar-logo-link { & .sidebar-logo-link {
text-align: center;
height: 100%; height: 100%;
width: 100%; width: 100%;
& .sidebar-logo { & .sidebar-logo {
margin-left: 55px; //margin-left: 55px;
width: 67px; width: 85px;
height: 36px; height: 50px;
vertical-align: middle; vertical-align: middle;
margin-right: 12px; margin-right: 12px;
} }
......
...@@ -252,7 +252,7 @@ export default { ...@@ -252,7 +252,7 @@ export default {
&.active { &.active {
background-color: #fff; background-color: #fff;
//color: $color-theme; //color: $color-theme;
color: #1C92EC; color: #D20A10;
border-color: transparent; border-color: transparent;
//&::before { //&::before {
// content: ''; // content: '';
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
<!-- </el-dropdown-item>--> <!-- </el-dropdown-item>-->
<!-- </el-dropdown-menu>--> <!-- </el-dropdown-menu>-->
<!-- </el-dropdown>--> <!-- </el-dropdown>-->
<span>诺兰特(北京)</span> <span style="padding-left: 10px; color: white;">Manufacturing Execution System</span>
</div> </div>
<div class="right-menu"> <div class="right-menu">
<!-- <i class="el-icon-info" />--> <!-- <i class="el-icon-info" />-->
...@@ -120,7 +120,7 @@ export default { ...@@ -120,7 +120,7 @@ export default {
height: 6.4vh; height: 6.4vh;
overflow: hidden; overflow: hidden;
position: relative; position: relative;
background: #fff; background: #D20A10;
box-shadow: 0 1px 4px rgba(0,21,41,.08); box-shadow: 0 1px 4px rgba(0,21,41,.08);
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
...@@ -182,6 +182,7 @@ export default { ...@@ -182,6 +182,7 @@ export default {
font-size: 18px; font-size: 18px;
} }
.username-text { .username-text {
color: white;
margin-right: 12px; margin-right: 12px;
} }
.right-menu-item { .right-menu-item {
...@@ -215,6 +216,7 @@ export default { ...@@ -215,6 +216,7 @@ export default {
} }
.el-icon-caret-bottom { .el-icon-caret-bottom {
color: white;
cursor: pointer; cursor: pointer;
position: absolute; position: absolute;
right: -20px; right: -20px;
......
...@@ -71,6 +71,7 @@ ...@@ -71,6 +71,7 @@
.el-submenu__title { .el-submenu__title {
&:hover { &:hover {
background-color: $menuHover !important; background-color: $menuHover !important;
color: #FFFFFF!important;
} }
} }
...@@ -219,11 +220,11 @@ ...@@ -219,11 +220,11 @@
} }
#app .sidebar-container .el-submenu .el-menu-item.is-active { #app .sidebar-container .el-submenu .el-menu-item.is-active {
background-color: #1C92EC !important; background-color: #D20A10 !important;
} }
.router-link-active .el-menu-item.is-active { .router-link-active .el-menu-item.is-active {
background-color: #112C59 !important; background-color: #D20A10 !important;
} }
// hover样式 // hover样式
...@@ -244,7 +245,7 @@ ...@@ -244,7 +245,7 @@
color: #46bcf2 !important; color: #46bcf2 !important;
} }
.el-menu-item.submenu-title-noDropdown:hover { .el-menu-item.submenu-title-noDropdown:hover {
color: #46bcf2 !important; color: #FFFFFF !important;
} }
.el-menu--vertical .el-menu-item:hover { .el-menu--vertical .el-menu-item:hover {
color: #46bcf2 !important; color: #46bcf2 !important;
...@@ -254,11 +255,11 @@ ...@@ -254,11 +255,11 @@
background-color: #FFFFFF !important; background-color: #FFFFFF !important;
> .el-submenu__title { > .el-submenu__title {
background-color: #0A5894 !important; background-color: #FFFFFF !important;
color: white !important; color: #D20A10 !important;
.el-submenu__icon-arrow { .el-submenu__icon-arrow {
color: #46bcf2 !important; color: #D20A10 !important;
} }
} }
...@@ -266,8 +267,8 @@ ...@@ -266,8 +267,8 @@
.el-menu-item { .el-menu-item {
//line-height: 24px!important; //line-height: 24px!important;
//white-space: pre-wrap; //white-space: pre-wrap;
background-color: #0A5894 !important; background-color: #FFFFFF !important;
color: white !important; color: #333333 !important;
&.is-active { &.is-active {
color: white !important; color: white !important;
......
...@@ -80,15 +80,15 @@ $bg-page-light: #f9f9f9; ...@@ -80,15 +80,15 @@ $bg-page-light: #f9f9f9;
$bg-menu-hover: #f2f6fc; $bg-menu-hover: #f2f6fc;
// sidebar // sidebar
$menuText:#B7D7EF; $menuText:#FFFFFF;
$menuActiveText:#46BCF2; $menuActiveText:#333333;
$subMenuActiveText:#f4f4f5; //https://github.com/ElemeFE/element/issues/12951 $subMenuActiveText:#f4f4f5; //https://github.com/ElemeFE/element/issues/12951
$menuBg:#0A4877; $menuBg:#2C333A;
$menuHover:#168AE2 ; $menuHover:#D20A10 ;
$subMenuBg:#0F2850; $subMenuBg:#0F2850;
$subMenuHover:#168AE2; $subMenuHover:#D20A10;
$sideBarWidth: 200px; $sideBarWidth: 200px;
$sideHideWidth: 54px; $sideHideWidth: 54px;
......
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