Merge branch 'master' of http://git.dongkesoft.com:9001/iBOSS-2.0-Mini/iboss-mini-web

src/components/main/components/side-menu/side-menu.less

@@ -32,7 +32,6 @@
     padding: 6px 15px;
     width: 100%;
     text-align: center;
-    color: #495060;
   }
 }
 .menu-title{

src/components/main/components/side-menu/side-menu.vue

@@ -17,7 +17,7 @@
       <img v-if="collapsed" src="@/assets/images/new-logo-small.png" width="40px">
       <img v-else src="@/assets/images/new-logo.png" width="120px">
     </div>
-    <div v-show="!collapsed" style="width: 100%;text-align: center;margin-bottom: 20px;margin-top: 20px;display: flex;justify-content: center;">
+    <div v-if="!collapsed" style="width: 100%;text-align: center;margin-bottom: 20px;margin-top: 20px;display: flex;justify-content: center;">
       <Input prefix="ios-search" v-model="menuName" clearable @on-enter="selectRoute" @on-clear="selectRoute" ref="search"
              class="search-menu" :placeholder="$t('inputWords', {'search-name': $t('functionName')})"/>
     </div>

src/components/main/components/tags-nav/tags-nav.less

@@ -133,10 +133,10 @@
       border-radius: 4px 4px 0 0!important;
       cursor: pointer;
     }
-    .ivu-tag:hover{
-      background-color: rgba(222, 230, 255, 1)!important;
-      border-color:transparent!important;
-    }
+    //.ivu-tag:hover{
+    //  background-color: rgba(222, 230, 255, 1)!important;
+    //  border-color:transparent!important;
+    //}
   }
 
 

src/components/main/main.less

@@ -67,6 +67,16 @@
 .ivu-menu-submenu > .ivu-menu > .ivu-menu-item > i {
   margin-right: 8px !important;
 }
+
+.ivu-select-dropdown{
+  background-color: #272541!important;
+}
+.ivu-dropdown-item{
+  color: #FFFFFF!important;
+}
+.ivu-dropdown-item:hover{
+  background-color: #272541!important;
+}
 .collased-menu-dropdown{
   width: 100%;
   margin: 0;
@@ -83,9 +93,9 @@
   &:hover{
     background: rgba(100, 100, 100, 0.1);
   }
-  //& * {
-  //  color: #515a6e;
-  //}
+  & * {
+    color: #FFFFFF;
+  }
   .ivu-menu-item > i{
     margin-right: 12px !important;
   }