Merge pull request 'master' (#24) from master into prod

Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/24

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;
   }
 }
 

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;
     }
   }

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;

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;

src/layout/siderbar/index.vue

@@ -8,8 +8,8 @@
         :default-active="activeMenu"
         :unique-opened="true"
         :collapse="siderbarStore.isCollapse"
-        active-text-color="#333"
+        active-text-color="#927648"
-        text-color="#333"
+        text-color="#575757"
         style="border: none;"
         :collapse-transition="false"
     >

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;
+    background-color: rgba(190,162,102,0.1);;
-    border: 1px solid #418DFF;
+    border: 1px solid #BEA266;
     color: #333333;
 
     > span:first-child {
-      color: #418DFF;
+      color: #BEA266;
     }
 
   }