center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
wangjiahao 2021-10-12 12:34:23 +08:00
commit a0a823bbd3
4 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/src/components/dataease/DeAsideContainer.vue
View File

@ -43,7 +43,7 @@ export default {
padding: 10px; padding: 10px;
border-radius: 2px; border-radius: 2px;
box-sizing: border-box; box-sizing: border-box;
background-color: var(--SiderBG); background-color: var(--SiderBG, #FFF);
height: calc(100vh - 56px); height: calc(100vh - 56px);
border-right: 0px; border-right: 0px;
position: relative; position: relative;

2
frontend/src/layout/components/Topbar.vue
View File

@ -8,7 +8,7 @@
class="de-top-menu" class="de-top-menu"
mode="horizontal" mode="horizontal"
:style="{'margin-left': '260px', 'position': 'absolute'}" :style="{'margin-left': '260px', 'position': 'absolute'}"
active-text-color="#409EFF" active-text-color="#FFFFFF"
:default-active="activeMenu" :default-active="activeMenu"
@select="handleSelect" @select="handleSelect"
> >

6
frontend/src/styles/sidebar.scss
View File

@ -69,9 +69,9 @@
.submenu-title-noDropdown:not(.is-active), .el-submenu__title { .submenu-title-noDropdown:not(.is-active), .el-submenu__title {
color: var(--SiderTextColor); color: var(--SiderTextColor, #1e212a);
&:hover { &:hover {
background-color: var(--MenuHovorBG, #ecf5ff) !important; background-color: var(--MenuHovorBG, rgba(158,158,158,.2)) !important;
color: var(--TextActive, #409EFF); color: var(--TextActive, #409EFF);
} }
&:focus { &:focus {
@ -97,7 +97,7 @@
background-color: var(--SiderBG) !important; background-color: var(--SiderBG) !important;
color: var(--SiderTextColor); color: var(--SiderTextColor);
&:hover { &:hover {
background-color: var(--MenuHovorBG, #ecf5ff) !important; background-color: var(--MenuHovorBG, rgba(158,158,158,.2)) !important;
color: var(--TextActive) !important; color: var(--TextActive) !important;
} }
} }

15
frontend/src/styles/topbar.scss
View File

@ -6,7 +6,7 @@
z-index: 1001; z-index: 1001;
overflow: hidden; overflow: hidden;
border-bottom: 1px solid var(--TopBG, #E6E6E6); border-bottom: 1px solid var(--TopBG, #E6E6E6);
background-color: var(--TopBG, #ffffff); background-color: var(--TopBG, #f1f3f8);
.log { .log {
padding: 0 16px; padding: 0 16px;
line-height: 56px; line-height: 56px;
@ -25,27 +25,28 @@
.el-menu { .el-menu {
float: left; float: left;
border: none !important; border: none !important;
background-color: var(--TopBG, #ffffff) !important; background-color: var(--TopBG, #f1f3f8) !important;
.nav-item { .nav-item {
display: inline-block; display: inline-block;
.el-menu-item:not(.is-active) { .el-menu-item:not(.is-active) {
color: var(--TopTextColor); color: var(--TopTextColor, #1e212a);
opacity: 0.65; opacity: 0.65;
&:hover { &:hover {
background-color: var(--MenuHovorBG, #ecf5ff) !important; background-color: var(--MenuHovorBG, rgba(158,158,158,.2)) !important;
opacity: 1; opacity: 1;
} }
&:focus { &:focus {
background-color: var(--MenuActiveBG, #ecf5ff) !important; background-color: var(--MenuActiveBG, $--color-primary) !important;
opacity: 1; opacity: 1;
color: var(--TopTextColor, #f4f4f5);
} }
} }
.el-menu-item.is-active { .el-menu-item.is-active {
background-color: var(--MenuActiveBG, #ecf5ff) ; background-color: var(--MenuActiveBG, $--color-primary) ;
color: var(--TextActive) !important; color: var(--TextActive, #f4f4f5) !important;
opacity: 1; opacity: 1;
} }