added @media (max-width:414px)

bknds · bknds · commit 0e5d3f0f5b4f · 2018-03-24T11:20:32.000+08:00
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 
 
-[Demo](http://treesflower.com/dist)
+[Demo](http://treesflower.com/ng-pi-admin)
 
 ## Getting started
 ```
diff --git a/src/app/pages/menu.ts b/src/app/pages/menu.ts
@@ -108,10 +108,6 @@ export let MENU_ITEM = [
         title: 'Menu Levels',
         icon: 'sitemap',
         children: [
-            {
-                path: 'levels2',
-                title: 'Menu Level2'/* creatRouterLink() bug if children 现停止下一循环*/
-            },
             {
                 path: 'levels1',
                 title: 'Menu Level1',
@@ -121,6 +117,14 @@ export let MENU_ITEM = [
                         title: 'Menu Level1-1'
                     }
                 ]
+            },
+            {
+                path: 'levels2',
+                title: 'Menu Level2'
+            },
+            {
+                path: 'levels3',
+                title: 'Menu Level3'
             }
         ]
     },
diff --git a/src/app/shared/components/pages-top/pages-top.component.scss b/src/app/shared/components/pages-top/pages-top.component.scss
@@ -160,4 +160,22 @@
         border: 2px solid $sidebar-bg;
         border-radius: 50%;
     }
+}
+
+@media (max-width:414px) {
+    .avatar-wrap {
+        width: auto;
+        .avatar {
+            border-radius: 50px;
+        }
+        .user-info-wrap {
+            display: none;
+        }
+    }
+    .collapse-menu {
+        left: 100px;
+    }
+    .search-group {
+        display: none;
+    }
 }
diff --git a/src/app/shared/components/sidebar/sidebar.component.scss b/src/app/shared/components/sidebar/sidebar.component.scss
@@ -15,18 +15,6 @@
     }
 }
 
-@media (max-width:970px) {
-    .pages-sider {
-        width: 0;
-    }
-}
-
-@media (max-width:1440px) {
-    .pages-sider {
-        width: 210px;
-    }
-}
-
 .side-collapsed {
     width: 0;
     /* .avatar-wrap {
@@ -42,4 +30,16 @@
     .user-info-wrap {
         transform: scale(0, 0);
     } */
+}
+
+@media (max-width:1440px) {
+    .pages-sider {
+        width: 210px;
+    }
+}
+
+@media (max-width:970px) {
+    .pages-sider {
+        width: 0;
+    }
 }
diff --git a/src/app/shared/components/sidebar/sidebar.component.ts b/src/app/shared/components/sidebar/sidebar.component.ts
@@ -19,13 +19,8 @@ export class SidebarComponent implements OnInit {
 
   ngOnInit() {
     this.menuInfo = this._menuService.putSidebarJson();
-    console.log(this.menuInfo);
-    
-
     this._sidebarToggle();
-
     this._menuService.selectItem(this.menuInfo);/* ----->初始化判断路由isActive状态  未完成  待优化 */
-
     this._isSelectItem(this.menuInfo);
   }
 

Original file line number	Diff line number	Diff line change
`@@ -108,10 +108,6 @@ export let MENU_ITEM = [`
`108`	`108`	`title: 'Menu Levels',`
`109`	`109`	`icon: 'sitemap',`
`110`	`110`	`children: [`
`111`		`- {`
`112`		`- path: 'levels2',`
`113`		`- title: 'Menu Level2'/* creatRouterLink() bug if children 现停止下一循环*/`
`114`		`- },`
`115`	`111`	`{`
`116`	`112`	`path: 'levels1',`
`117`	`113`	`title: 'Menu Level1',`
`@@ -121,6 +117,14 @@ export let MENU_ITEM = [`
`121`	`117`	`title: 'Menu Level1-1'`
`122`	`118`	`}`
`123`	`119`	`]`
	`120`	`+ },`
	`121`	`+ {`
	`122`	`+ path: 'levels2',`
	`123`	`+ title: 'Menu Level2'`
	`124`	`+ },`
	`125`	`+ {`
	`126`	`+ path: 'levels3',`
	`127`	`+ title: 'Menu Level3'`
`124`	`128`	`}`
`125`	`129`	`]`
`126`	`130`	`},`