Merge branch 'develop' of github.com:TaleLin/lin-cms-vue into develop

Author: GongJS

package-lock.json

@@ -52,7 +52,7 @@
     "fs-extra": "^7.0.1",
     "inquirer": "^6.2.2",
     "js-yaml": "^3.12.2",
-    "node-sass": "^4.9.4",
+    "node-sass": "^4.12.0",
     "sass-loader": "^7.1.0",
     "semver": "^5.6.0",
     "shelljs": "^0.8.3",

package.json

@@ -45,7 +45,7 @@
 // 页面切换动画
 .fade-transform-leave-active,
 .fade-transform-enter-active {
-  transition: all 0.5s;
+  transition: all 0.3s;
 }
 .fade-transform-enter {
   opacity: 0;

src/assets/styles/realize/animation.scss

@@ -874,3 +874,9 @@ $typeMap: (primary:#3963BC,
   }
 }
 
+/* dropdown */
+@include b(dropdown) {
+  & .el-dropdown__caret-button {
+    border-left: none !important;
+  }
+}