diff --git a/src/assets/styles/custom.scss b/src/assets/styles/custom.scss index f50a2761..ed00f118 100644 --- a/src/assets/styles/custom.scss +++ b/src/assets/styles/custom.scss @@ -173,7 +173,7 @@ /** 表格更多操作下拉样式 */ .el-table .el-dropdown-link { cursor: pointer; - color: #0028ff; + color: #B12D29; // 5373ff margin-left: 5px; } @@ -365,9 +365,10 @@ } .main-container{ - margin-top: 6px; + // margin-top: 6px; + margin-top: 0px; // margin-right: 6px; - padding: 6px; + // padding: 6px; // border: 1px dashed #e0e0e0; } diff --git a/src/assets/styles/element-variables.scss b/src/assets/styles/element-variables.scss index a344ebc5..ba69e056 100644 --- a/src/assets/styles/element-variables.scss +++ b/src/assets/styles/element-variables.scss @@ -5,7 +5,7 @@ /* theme color */ // $--color-primary: #1890ff; -$--color-primary: #0028ff; +$--color-primary: #B12D29; $--color-success: #13ce66; $--color-warning: #ffba00; $--color-danger: #ff4949; diff --git a/src/assets/styles/header-top.scss b/src/assets/styles/header-top.scss index 08710e59..d6663297 100644 --- a/src/assets/styles/header-top.scss +++ b/src/assets/styles/header-top.scss @@ -4,8 +4,8 @@ position: relative; height: 50px; // box-shadow: 0 1px 0px 0 rgb(0 0 0 / 5%); - box-shadow: 0px 2px 2px 0 rgb(2 2 2 / 5%); - background: #ffffff; + // box-shadow: 0px 2px 2px 0 rgb(2 2 2 / 5%); + // background: #ffffff; // background: linear-gradient(90deg,#1d42ab,#2173dc,#1e93ff); // border-bottom: 1px solid #c1c1c1; } diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss index 6efcf2da..2dd35c01 100644 --- a/src/assets/styles/index.scss +++ b/src/assets/styles/index.scss @@ -15,7 +15,8 @@ body { // font-family: Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif; // font-family: PingFang SC,Hiragino Sans GB,Arial,Microsoft YaHei,Verdana,Roboto,Noto,Helvetica Neue,sans-serif!important; // font-family: Microsoft YaHei,PingFang SC,Hiragino Sans GB,Arial,Verdana,Roboto,Noto,Helvetica Neue,sans-serif!important; - background-color: #eff0f4; + // background-color: #eff0f4; + background-color: #F6F6F6; // background-color: #f7f7f7; // background-color: #e9e8f1; color:#000000 @@ -182,7 +183,7 @@ aside { cursor: pointer; &:hover { - color: #0028ff; + color: #B12D29; } } diff --git a/src/assets/styles/sidebar.scss b/src/assets/styles/sidebar.scss index 0bcec5b5..89a38ccc 100644 --- a/src/assets/styles/sidebar.scss +++ b/src/assets/styles/sidebar.scss @@ -20,14 +20,16 @@ background-color:#fff!important; // background-color: #ffffff3b !important; // background-color:transparent !important; - margin-top: 12px; - margin-left: 8px; - // height: 100%; + // margin-top: 12px; + margin-top: 0px; + margin-left: 0px; + height: 100%; float: left; font-weight: 400; z-index: 1001; // overflow: hidden; border-radius: 3px; + border-radius: 0px; font-family: Helvetica Neue, Helvetica, PingFang SC,Microsoft YaHei, Hiragino Sans GB, Arial, sans-serif; @@ -125,14 +127,14 @@ background: #f0faff96!important; font-weight: 600; // border-left: 2px solid #1890ff!important; - border-left: 2px solid #0027ff!important; + border-left: 2px solid #B12D29!important; // color: #1890ff!important; color: black ; } &.is-active { // color: #000!important; - color: #0027ff!important; + color: #B12D29!important; font-weight: 600; // background: #fff!important; background: transparent!important; @@ -142,7 +144,7 @@ .el-menu-item.is-active { // color: #000!important; - color: #0027ff!important; + color: #B12D29!important; font-weight: 600; // background: #fff!important; background: transparent!important; @@ -200,10 +202,10 @@ background: #e8f4ff; border: 1px solid #a3d3ff1c; .svg-icon { - color:#0028ff!important; + color:#B12D29!important; } .name { - color:#0028ff!important; + color:#B12D29!important; } } @@ -273,10 +275,10 @@ background: #e8f4ff; border: 1px solid #a3d3ff1c; .svg-icon { - color:#0027ff!important; + color:#B12D29!important; } .name { - color:#0027ff!important; + color:#B12D29!important; } } diff --git a/src/assets/styles/variables.scss b/src/assets/styles/variables.scss index f470bdb5..cb58df83 100644 --- a/src/assets/styles/variables.scss +++ b/src/assets/styles/variables.scss @@ -23,7 +23,7 @@ $panGreen: #30B08F; // 自定义erp风格 $base-menu-color:#161616; -$base-menu-color-active:#0028ff; +$base-menu-color-active:#B12D29; $base-menu-background:transparent; $base-logo-title-color: #ffffff; @@ -32,7 +32,7 @@ $base-menu-light-background:#ffffff; $base-logo-light-title-color: #001529; $base-sub-menu-background:inherit; -$base-sub-menu-hover:#1890FF; +$base-sub-menu-hover:#B12D29; // 自定义暗色菜单风格 /** diff --git a/src/components/CardWithHeader/index.vue b/src/components/CardWithHeader/index.vue index de83dcaa..dd37b646 100644 --- a/src/components/CardWithHeader/index.vue +++ b/src/components/CardWithHeader/index.vue @@ -55,7 +55,7 @@ export default { width: 3px; height: 14px; content: ''; - background: #0028ff; + background: #B12D29; // background: #409EFF; border-radius: 2px; } diff --git a/src/components/HeaderSearch/index.vue b/src/components/HeaderSearch/index.vue index c44eff56..18c4d399 100644 --- a/src/components/HeaderSearch/index.vue +++ b/src/components/HeaderSearch/index.vue @@ -1,20 +1,30 @@