diff --git a/nezha-fronted/src/assets/stylus/index.scss b/nezha-fronted/src/assets/stylus/index.scss index d23a44af9..17206a0de 100644 --- a/nezha-fronted/src/assets/stylus/index.scss +++ b/nezha-fronted/src/assets/stylus/index.scss @@ -1,5 +1,8 @@ $global-text-color-active: #ee9d3f; // 全局文字active字色 + $header-text-color: #fff; // header默认字色 $header-text-color-hover: #444; //header hover字色 +$content-left-text-color: #666; //左侧菜单默认字色 + @import './main.scss'; diff --git a/nezha-fronted/src/assets/stylus/main.scss b/nezha-fronted/src/assets/stylus/main.scss index 2838a3a7e..36996cfdd 100644 --- a/nezha-fronted/src/assets/stylus/main.scss +++ b/nezha-fronted/src/assets/stylus/main.scss @@ -169,40 +169,52 @@ html { /* begin--左侧列表*/ .content-left { float: left; - width: 270px; + width: 256px; height: 100%; border-right: 1px solid #cccccc; - padding: 0 12px 0 30px; + padding: 0 25px 0 15px; box-sizing: border-box; } .sidebar-title { - padding-top: 20px; - color: #aaaaaa; - font-size: 16px; + padding-top: 22px; + color: #333333; + font-size: 14px; } .sidebar-info { height: calc(90vh - 55px); width: 100%; - padding-top: 10px; + padding-top: 24px; } .content-left .sidebar-info-item { - line-height: 1.5rem; - padding: 0 10px 0 10px; + line-height: 20px; + padding: 0 0 0 10px; cursor: pointer; - color: #444444; - margin: 0 0 7px; + color: $content-left-text-color; + margin: 0 0 30px; display: block; } +.content-left .sidebar-info-item.el-checkbox { + padding: 0; +} .side-bar-menu-edit { - line-height: 1.5rem; + line-height: 20px; + float: right; +} +.side-bar-menu-edit>i, .sidebar-info-item .el-checkbox__label .checkbox-edit i { + font-size: 12px; + color: #999; +} +.sidebar-info-item .el-checkbox__label { + width: calc(100% - 25px); +} +.sidebar-info-item .el-checkbox__label>span:nth-child(2) { float: right; } .content-left .sidebar-info-item-active { - border-left: 3px solid #e07700; - font-weight: bold; + border-left: 2px solid $global-text-color-active; + color: $global-text-color-active; } .content-left .el-checkbox-group .sidebar-info-item-active { - font-weight: bold; border-left: none; } /* end--左侧列表*/ diff --git a/nezha-fronted/src/components/common/header.vue b/nezha-fronted/src/components/common/header.vue index 308ab71ad..4531c3706 100644 --- a/nezha-fronted/src/components/common/header.vue +++ b/nezha-fronted/src/components/common/header.vue @@ -465,7 +465,7 @@ } .nz-submenu.el-menu--horizontal .el-menu .el-menu-item:hover { - color: #ff9900 !important; + color: $global-text-color-active !important; } .el-menu-item > div, .el-menu-item > div > div { diff --git a/nezha-fronted/src/components/page/asset/asset.vue b/nezha-fronted/src/components/page/asset/asset.vue index 21e80d2fc..5b0656291 100644 --- a/nezha-fronted/src/components/page/asset/asset.vue +++ b/nezha-fronted/src/components/page/asset/asset.vue @@ -4,7 +4,7 @@