diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss index 99f9927..e47e3e0 100644 --- a/src/assets/styles/index.scss +++ b/src/assets/styles/index.scss @@ -21,14 +21,11 @@ html, body, #app, .el-container, .el-aside, .el-main { .el-main { background: #F4F6F8; padding: 0 0 0 18px; - //padding: 0; position: fixed; left: 200px; transition: left ease 0.15s; margin-left: 0; transition: margin-left .15s; - // -webkit-transition: width .15s; - // transition: width 0.15s; width: calc(100vw - 200px); &::-webkit-scrollbar { width: 6px; @@ -466,7 +463,7 @@ html, body, #app, .el-container, .el-aside, .el-main { .active { .close-icon { - fill: #418DFF; + fill: #BEA266; } } diff --git a/src/assets/styles/sidebar.scss b/src/assets/styles/sidebar.scss index 478bec1..15aad29 100644 --- a/src/assets/styles/sidebar.scss +++ b/src/assets/styles/sidebar.scss @@ -1,6 +1,9 @@ +.el-side { + border-radius: 10px; +} .logo { height: 106px; - background-color: #418DFF; + background-color: #BEA266; color: #ffffff; font-weight: bold; font-size: 26px; @@ -36,7 +39,7 @@ } } .el-menu-item.is-active { - background: #E9F4FF; + background: #BEA266; //background-color: #373350 !important; } } diff --git a/src/layout/appmain/AppMain.vue b/src/layout/appmain/AppMain.vue index 0c12187..7585e4b 100644 --- a/src/layout/appmain/AppMain.vue +++ b/src/layout/appmain/AppMain.vue @@ -33,6 +33,7 @@ max-height: calc(100vh - 96px); overflow: auto; background-color: #fff; + border-radius: 10px; } .app-main-container::-webkit-scrollbar { width:6px; diff --git a/src/layout/navbar/index.vue b/src/layout/navbar/index.vue index f334525..fb51821 100644 --- a/src/layout/navbar/index.vue +++ b/src/layout/navbar/index.vue @@ -70,6 +70,7 @@ const handleLogout = () => { justify-content: flex-start; align-items: center; background-color: #fff; + border-radius: 10px; .right-bar { margin-left: auto; display: flex; diff --git a/src/layout/siderbar/index.vue b/src/layout/siderbar/index.vue index 2242068..1426c84 100644 --- a/src/layout/siderbar/index.vue +++ b/src/layout/siderbar/index.vue @@ -8,8 +8,8 @@ :default-active="activeMenu" :unique-opened="true" :collapse="siderbarStore.isCollapse" - active-text-color="#333" - text-color="#333" + active-text-color="#927648" + text-color="#575757" style="border: none;" :collapse-transition="false" > diff --git a/src/layout/tagsview/index.vue b/src/layout/tagsview/index.vue index 2f1e438..a9a1ba7 100644 --- a/src/layout/tagsview/index.vue +++ b/src/layout/tagsview/index.vue @@ -83,17 +83,17 @@ init() border: 1px solid darkgray; font-size: 13px; margin-right: 8px; - border-radius: 4px; + border-radius: 6px; background-color: #fff; } .active { - background-color: #E9F4FF; - border: 1px solid #418DFF; + background-color: rgba(190,162,102,0.1);; + border: 1px solid #BEA266; color: #333333; > span:first-child { - color: #418DFF; + color: #BEA266; } }