fe / YOHOBUYPC · Commits

Go to a project

Authored by xuqi
Commit 34276d95ae36e5dfe7e7d21114003590702343a7 2 parents 44180dc6 8cf2b3f0

Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop

Inline Side-by-side
Showing 6 changed files with 29 additions and 24 deletions
@@ -10,7 +10,7 @@ @@ -10,7 +10,7 @@
10 position: relative; 10 position: relative;
11 z-index: 2; 11 z-index: 2;
12 background: #f0f0f0; 12 background: #f0f0f0;
13 - @include transition(transform .3s ease-out); 13 + @include transition(transform .3s);
14 } 14 }
15 15
16 .mobile-wrap.menu-open { 16 .mobile-wrap.menu-open {
@@ -27,7 +27,7 @@ @@ -27,7 +27,7 @@
27 bottom: 0; 27 bottom: 0;
28 background: #000; 28 background: #000;
29 opacity: 0; 29 opacity: 0;
30 - z-index: 99; 30 + z-index: 4;
31 @include transition(opacity 1s); 31 @include transition(opacity 1s);
32 } 32 }
33 33
1 .side-nav { 1 .side-nav {
2 - display: block; 2 + display: none;
3 background: #fff; 3 background: #fff;
4 position: fixed; 4 position: fixed;
5 top: 0; 5 top: 0;
6 bottom: 0; 6 bottom: 0;
7 - left: -540rem / $pxConvertRem;  
8 - right: 640rem / $pxConvertRem; 7 + left: 0;
  8 + right: 100rem / $pxConvertRem;
9 width: 540rem / $pxConvertRem; 9 width: 540rem / $pxConvertRem;
10 - z-index: -1; 10 + z-index: 1;
11 overflow: hidden; 11 overflow: hidden;
12 @include transition(all .3s); 12 @include transition(all .3s);
13 13
@@ -107,9 +107,7 @@ @@ -107,9 +107,7 @@
107 } 107 }
108 108
109 .side-nav.on { 109 .side-nav.on {
110 - left: 0;  
111 - right: 100rem / $pxConvertRem;  
112 - z-index: 3; 110 + display: block;
113 } 111 }
114 112
115 .sub-nav { 113 .sub-nav {
1 {{> layout/header}} 1 {{> layout/header}}
2 - <div class="mobile-wrap boys-wrap yoho-page">  
3 - {{! 首页header}}  
4 - {{# homeHeader}}  
5 - {{> home/home_header}}  
6 - {{/ homeHeader}} 2 + <div class="mobile-container">
  3 + <div class="mobile-wrap boys-wrap yoho-page">
  4 + {{! 首页header}}
  5 + {{# homeHeader}}
  6 + {{> home/home_header}}
  7 + {{/ homeHeader}}
7 8
8 - {{> home/content}}  
9 -  
10 - {{! 商品列表}}  
11 - {{# twoColumnGoods}}  
12 - {{> home/two_column_goods}}  
13 - {{/ twoColumnGoods}} 9 + {{> home/content}}
  10 +
  11 + {{! 商品列表}}
  12 + {{# twoColumnGoods}}
  13 + {{> home/two_column_goods}}
  14 + {{/ twoColumnGoods}}
14 15
15 - <div class="overlay"></div>  
16 - {{> layout/footer_tab}} 16 + <div class="overlay"></div>
  17 + {{> layout/footer_tab}}
  18 + </div>
  19 + {{> home/side_nav}}
17 </div> 20 </div>
18 - {{> home/side_nav}}  
19 {{> layout/footer}} 21 {{> layout/footer}}
1 {{> layout/header}} 1 {{> layout/header}}
  2 +<div class="mobile-container">
2 <div class="mobile-wrap girls-wrap yoho-page"> 3 <div class="mobile-wrap girls-wrap yoho-page">
3 {{! 首页header}} 4 {{! 首页header}}
4 {{# homeHeader}} 5 {{# homeHeader}}
@@ -11,4 +12,5 @@ @@ -11,4 +12,5 @@
11 {{> layout/footer_tab}} 12 {{> layout/footer_tab}}
12 </div> 13 </div>
13 {{> home/side_nav}} 14 {{> home/side_nav}}
  15 +</div>
14 {{> layout/footer}} 16 {{> layout/footer}}
1 {{> layout/header}} 1 {{> layout/header}}
2 - 2 +<div class="mobile-container">
3 <div class="mobile-wrap kids-wrap yoho-page"> 3 <div class="mobile-wrap kids-wrap yoho-page">
4 {{! 首页header}} 4 {{! 首页header}}
5 {{# homeHeader}} 5 {{# homeHeader}}
@@ -22,4 +22,5 @@ @@ -22,4 +22,5 @@
22 {{> layout/footer_tab}} 22 {{> layout/footer_tab}}
23 </div> 23 </div>
24 {{> home/side_nav}} 24 {{> home/side_nav}}
  25 +</div>
25 {{> layout/footer}} 26 {{> layout/footer}}
1 {{> layout/header}} 1 {{> layout/header}}
  2 +<div class="mobile-container">
2 <div class="mobile-wrap lifestyle-wrap yoho-page"> 3 <div class="mobile-wrap lifestyle-wrap yoho-page">
3 {{! 首页header}} 4 {{! 首页header}}
4 {{# homeHeader}} 5 {{# homeHeader}}
@@ -20,4 +21,5 @@ @@ -20,4 +21,5 @@
20 {{> layout/footer_tab}} 21 {{> layout/footer_tab}}
21 </div> 22 </div>
22 {{> home/side_nav}} 23 {{> home/side_nav}}
  24 +</div>
23 {{> layout/footer}} 25 {{> layout/footer}}