Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
Showing
5 changed files
with
18 additions
and
19 deletions
| @@ -51,6 +51,12 @@ | @@ -51,6 +51,12 @@ | ||
| 51 | right: 10rem / $pxConvertRem; | 51 | right: 10rem / $pxConvertRem; |
| 52 | } | 52 | } |
| 53 | 53 | ||
| 54 | + .nav-btn { | ||
| 55 | + @extend %nav; | ||
| 56 | + right: 10rem / $pxConvertRem; | ||
| 57 | + font-size: 14px; | ||
| 58 | + } | ||
| 59 | + | ||
| 54 | .nav-title { | 60 | .nav-title { |
| 55 | position: absolute; | 61 | position: absolute; |
| 56 | margin-left: 100rem / $pxConvertRem; | 62 | margin-left: 100rem / $pxConvertRem; |
| @@ -68,16 +74,6 @@ | @@ -68,16 +74,6 @@ | ||
| 68 | text-align: center; | 74 | text-align: center; |
| 69 | } | 75 | } |
| 70 | 76 | ||
| 71 | - .nav-btn { | ||
| 72 | - display: block; | ||
| 73 | - height: 100%; | ||
| 74 | - position: absolute; | ||
| 75 | - top: 0; | ||
| 76 | - right: 0; | ||
| 77 | - font-size: pxToRem(26px); | ||
| 78 | - color: #b0b0b0; | ||
| 79 | - padding-right: pxToRem(32px); | ||
| 80 | - } | ||
| 81 | } | 77 | } |
| 82 | .systemUpdate{ | 78 | .systemUpdate{ |
| 83 | width: 100%; | 79 | width: 100%; |
| @@ -117,7 +113,7 @@ | @@ -117,7 +113,7 @@ | ||
| 117 | top: 0; | 113 | top: 0; |
| 118 | left: 0; | 114 | left: 0; |
| 119 | p{ | 115 | p{ |
| 120 | - font-size: 52em / $pxConvertRem; | 116 | + font-size: 52em / $pxConvertRem; |
| 121 | line-height: 60rem / $pxConvertRem; | 117 | line-height: 60rem / $pxConvertRem; |
| 122 | &:first-of-type{ | 118 | &:first-of-type{ |
| 123 | padding-top: 90rem / $pxConvertRem; | 119 | padding-top: 90rem / $pxConvertRem; |
| @@ -166,4 +162,4 @@ | @@ -166,4 +162,4 @@ | ||
| 166 | } | 162 | } |
| 167 | .none{ | 163 | .none{ |
| 168 | display: none; | 164 | display: none; |
| 169 | -} | ||
| 165 | +} |
| @@ -187,6 +187,7 @@ $suggest: sprite-map("me/suggest/*.png",$spacing: 5px); | @@ -187,6 +187,7 @@ $suggest: sprite-map("me/suggest/*.png",$spacing: 5px); | ||
| 187 | background: #fff; | 187 | background: #fff; |
| 188 | border: none; | 188 | border: none; |
| 189 | outline: none; | 189 | outline: none; |
| 190 | + resize: none; | ||
| 190 | } | 191 | } |
| 191 | 192 | ||
| 192 | .img-form { | 193 | .img-form { |
| @@ -320,4 +321,4 @@ $suggest: sprite-map("me/suggest/*.png",$spacing: 5px); | @@ -320,4 +321,4 @@ $suggest: sprite-map("me/suggest/*.png",$spacing: 5px); | ||
| 320 | } | 321 | } |
| 321 | } | 322 | } |
| 322 | } | 323 | } |
| 323 | -} | ||
| 324 | +} |
| @@ -13,9 +13,10 @@ | @@ -13,9 +13,10 @@ | ||
| 13 | <p class="nav-title">{{.}}</p> | 13 | <p class="nav-title">{{.}}</p> |
| 14 | {{/navTitle}} | 14 | {{/navTitle}} |
| 15 | {{# navBtn}} | 15 | {{# navBtn}} |
| 16 | - <!-- <span class="nav-btn">{{.}}</span> --> | ||
| 17 | - <!-- <i class="iconfont nav-home"></i> --> | ||
| 18 | - <!-- <div class="homebuttom none"> | 16 | + <span class="nav-btn">{{.}}</span> |
| 17 | + {{!-- | ||
| 18 | + <i class="iconfont nav-home"></i> | ||
| 19 | + <div class="homebuttom none"> | ||
| 19 | <ul> | 20 | <ul> |
| 20 | <li> | 21 | <li> |
| 21 | <i class="iconfont"></i> | 22 | <i class="iconfont"></i> |
| @@ -34,7 +35,8 @@ | @@ -34,7 +35,8 @@ | ||
| 34 | <span>我的</span> | 35 | <span>我的</span> |
| 35 | </li> | 36 | </li> |
| 36 | </ul> | 37 | </ul> |
| 37 | - </div> --> | 38 | + </div> |
| 39 | + --}} | ||
| 38 | {{/ navBtn}} | 40 | {{/ navBtn}} |
| 39 | </header> | 41 | </header> |
| 40 | 42 |
-
Please register or login to post a comment