Merge remote-tracking branch 'origin/master'

src/components/Hamburger/index.vue

@@ -7,7 +7,6 @@
       xmlns="http://www.w3.org/2000/svg"
       width="64"
       height="64"
-      style="color:#fff"
     >
       <path d="M408 442h480c4.4 0 8-3.6 8-8v-56c0-4.4-3.6-8-8-8H408c-4.4 0-8 3.6-8 8v56c0 4.4 3.6 8 8 8zm-8 204c0 4.4 3.6 8 8 8h480c4.4 0 8-3.6 8-8v-56c0-4.4-3.6-8-8-8H408c-4.4 0-8 3.6-8 8v56zm504-486H120c-4.4 0-8 3.6-8 8v56c0 4.4 3.6 8 8 8h784c4.4 0 8-3.6 8-8v-56c0-4.4-3.6-8-8-8zm0 632H120c-4.4 0-8 3.6-8 8v56c0 4.4 3.6 8 8 8h784c4.4 0 8-3.6 8-8v-56c0-4.4-3.6-8-8-8zM142.4 642.1L298.7 519a8.84 8.84 0 0 0 0-13.9L142.4 381.9c-5.8-4.6-14.4-.5-14.4 6.9v246.3a8.9 8.9 0 0 0 14.4 7z" />
     </svg>

src/components/HeaderSearch/index.vue

@@ -155,6 +155,7 @@ export default {
     cursor: pointer;
     font-size: 18px;
     vertical-align: middle;
+    color: #fff;
   }
 
   .header-search-select {

src/components/Screenfull/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <svg-icon :icon-class="isFullscreen?'exit-fullscreen':'fullscreen'" @click="click" />
+    <svg-icon :icon-class="isFullscreen?'exit-fullscreen':'fullscreen'" @click="click"  style="color:#fff"/>
   </div>
 </template>
 

src/layout/components/Navbar.vue

@@ -146,7 +146,7 @@ export default {
       padding: 0 8px;
       height: 100%;
       font-size: 18px;
-      color: #5a5e66;
+      color: #fff;
       vertical-align: text-bottom;
 
       &.hover-effect {

src/layout/components/Sidebar/Logo.vue

@@ -1,12 +1,24 @@
 <template>
-  <div class="sidebar-logo-container" :class="{'collapse':collapse}" :style="{ backgroundColor: sideTheme === 'theme-dark' ? variables.menuBg : variables.menuLightBg }">
+  <div
+    class="sidebar-logo-container"
+    :class="{ collapse: collapse }"
+    :style="{
+      backgroundColor:
+        sideTheme === 'theme-dark' ? variables.menuBg : variables.menuLightBg,
+    }"
+  >
     <transition name="sidebarLogoFade">
-      <router-link v-if="collapse" key="collapse" class="sidebar-logo-link" to="/">
-        <img v-if="logo" :src="logo" class="sidebar-logo">
-        <h1 v-else class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' ? variables.sidebarTitle : variables.sidebarLightTitle }">{{ title }} </h1>
+      <router-link
+        v-if="collapse"
+        key="collapse"
+        class="sidebar-logo-link"
+        to="/"
+      >
+        <img v-if="logo" :src="logo" class="sidebar-logo-mini" />
+        <!-- <h1 v-else class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' ? variables.sidebarTitle : variables.sidebarLightTitle }">{{ title }} </h1> -->
       </router-link>
       <router-link v-else key="expand" class="sidebar-logo-link" to="/">
-        <img v-if="logo" :src="logo" class="sidebar-logo">
+        <img v-if="logo" :src="logo" class="sidebar-logo" />
         <!-- <h1 class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' ? variables.sidebarTitle : variables.sidebarLightTitle }">{{ title }} </h1> -->
       </router-link>
     </transition>
@@ -14,32 +26,32 @@
 </template>
 
 <script>
-import logoImg from '@/assets/logo/logo.png'
-import variables from '@/assets/styles/variables.scss'
+import logoImg from "@/assets/logo/logo.png";
+import variables from "@/assets/styles/variables.scss";
 
 export default {
-  name: 'SidebarLogo',
+  name: "SidebarLogo",
   props: {
     collapse: {
       type: Boolean,
-      required: true
-    }
+      required: true,
+    },
   },
   computed: {
     variables() {
       return variables;
     },
-	sideTheme() {
-      return this.$store.state.settings.sideTheme
-    }
+    sideTheme() {
+      return this.$store.state.settings.sideTheme;
+    },
   },
   data() {
     return {
-      title: '大木仓储管理系统',
-      logo: logoImg
-    }
-  }
-}
+      title: "大木仓储管理系统",
+      logo: logoImg,
+    };
+  },
+};
 </script>
 
 <style lang="scss" scoped>
@@ -54,8 +66,8 @@ export default {
 
 .sidebar-logo-container {
   position: relative;
-  width: 100%;
-  height:60px;
+  // width: 100%;
+  height: 60px;
   line-height: 60px;
   background: #014da1 !important;
   text-align: center;
@@ -70,7 +82,11 @@ export default {
       vertical-align: middle;
       margin-right: 12px;
     }
-
+    & .sidebar-logo-mini {
+      height: 18px;
+      vertical-align: middle;
+      margin-right: 12px;
+    }
     & .sidebar-title {
       display: inline-block;
       margin: 0;