Merge pull request #150 from ts-react/v1

V1
pansyjs · Jun 9, 2019 · 8524810 · 8524810
2 parents fa189c4 + d0cb1e8
commit 8524810
Show file tree

Hide file tree

Showing 4 changed files with 288 additions and 149 deletions.
diff --git a/package.json b/package.json
@@ -100,9 +100,9 @@
     "stylelint-order": "^3.0.0",
     "stylelint-prettier": "^1.1.1",
     "typescript": "^3.5.1",
-    "umi": "^2.6.17",
-    "umi-plugin-react": "^1.7.5",
-    "umi-types": "^0.3.2"
+    "umi": "^2.7.3",
+    "umi-plugin-react": "^1.8.2",
+    "umi-types": "^0.3.7"
   },
   "husky": {
     "hooks": {

diff --git a/src/components/sidebar-menu/sidebar-menu.less b/src/components/sidebar-menu/sidebar-menu.less
@@ -45,6 +45,11 @@
     }
   }
 
+  .ant-menu-root {
+    height: ~'calc(100vh - @{nav-header-height})';
+    overflow-y: auto;
+  }
+
   &.is-collapsed {
     // 请根据项目logo自行调整
     .lotus-sidebar-menu__logo > img {

diff --git a/src/global.less b/src/global.less
@@ -50,10 +50,9 @@ ol {
 // 美化滚动条
 ::-webkit-scrollbar {
   width: 5px;
-  height: 5px
 }
 
 ::-webkit-scrollbar-thumb {
-  background: #ccc;
+  background: transparent;
   border-radius: 4px;
 }