Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
Showing
2 changed files
with
34 additions
and
22 deletions
| @@ -217,18 +217,19 @@ $basicBtnC:#eb0313; | @@ -217,18 +217,19 @@ $basicBtnC:#eb0313; | ||
| 217 | height: auto; | 217 | height: auto; |
| 218 | li { | 218 | li { |
| 219 | float: left; | 219 | float: left; |
| 220 | + img { | ||
| 221 | + height: auto; | ||
| 222 | + } | ||
| 220 | } | 223 | } |
| 221 | } | 224 | } |
| 222 | } | 225 | } |
| 223 | .goodsName { | 226 | .goodsName { |
| 224 | box-sizing: border-box; | 227 | box-sizing: border-box; |
| 225 | width: 100%; | 228 | width: 100%; |
| 226 | - min-height: pxToRem(88px); | ||
| 227 | font-size: pxToRem(28px); | 229 | font-size: pxToRem(28px); |
| 228 | color: #fff; | 230 | color: #fff; |
| 229 | - padding-left: pxToRem(28px); | ||
| 230 | - padding-right: pxToRem(28px); | ||
| 231 | - line-height: pxToRem(36px); | 231 | + padding: pxToRem(20px) pxToRem(28px); |
| 232 | + line-height: pxToRem(48px); | ||
| 232 | background-color: #515150; | 233 | background-color: #515150; |
| 233 | } | 234 | } |
| 234 | .goodsSubtitle { | 235 | .goodsSubtitle { |
| @@ -287,14 +288,14 @@ $basicBtnC:#eb0313; | @@ -287,14 +288,14 @@ $basicBtnC:#eb0313; | ||
| 287 | line-height: pxToRem(88px); | 288 | line-height: pxToRem(88px); |
| 288 | } | 289 | } |
| 289 | } | 290 | } |
| 290 | - .goodsName { | ||
| 291 | - // width: 100%; | ||
| 292 | - display: table; | ||
| 293 | - span { | ||
| 294 | - display: table-cell; | ||
| 295 | - vertical-align: middle; | ||
| 296 | - } | ||
| 297 | - } | 291 | + // .goodsName { |
| 292 | + // // width: 100%; | ||
| 293 | + // display: table; | ||
| 294 | + // span { | ||
| 295 | + // display: table-cell; | ||
| 296 | + // vertical-align: middle; | ||
| 297 | + // } | ||
| 298 | + // } | ||
| 298 | .vip-level { | 299 | .vip-level { |
| 299 | box-sizing: box-border; | 300 | box-sizing: box-border; |
| 300 | padding-left: pxToRem(28px); | 301 | padding-left: pxToRem(28px); |
| @@ -369,21 +370,28 @@ $basicBtnC:#eb0313; | @@ -369,21 +370,28 @@ $basicBtnC:#eb0313; | ||
| 369 | } | 370 | } |
| 370 | } | 371 | } |
| 371 | .enter-store { | 372 | .enter-store { |
| 372 | - min-height: pxToRem(100px); | ||
| 373 | - display: table; | 373 | + position: relative; |
| 374 | + padding: 0 pxToRem(180px) 0 pxToRem(114px); | ||
| 375 | + line-height: pxToRem(84px); | ||
| 374 | background-color: #fff; | 376 | background-color: #fff; |
| 375 | - a { | ||
| 376 | - display: table-cell; | ||
| 377 | - vertical-align: middle; | ||
| 378 | - text-align: left; | ||
| 379 | - } | 377 | + white-space: nowrap; |
| 378 | + overflow: hidden; | ||
| 379 | + text-overflow: ellipsis; | ||
| 380 | + | ||
| 380 | .store-logo { | 381 | .store-logo { |
| 381 | - // padding-right: 35rem/$pxConvertRem; | 382 | + position: absolute; |
| 383 | + left: 0; | ||
| 384 | + top: 1px; | ||
| 385 | + width: pxToRem(68px); | ||
| 386 | + height: pxToRem(84px); | ||
| 387 | + margin-left: pxToRem(30px); | ||
| 388 | + font-size: 0; | ||
| 389 | + text-align: center; | ||
| 382 | img { | 390 | img { |
| 391 | + display: inline-block; | ||
| 383 | width: auto; | 392 | width: auto; |
| 384 | height: pxToRem(68px); | 393 | height: pxToRem(68px); |
| 385 | - margin-left: 0; | ||
| 386 | - margin-right: pxToRem(-25px); | 394 | + vertical-align: middle; |
| 387 | } | 395 | } |
| 388 | } | 396 | } |
| 389 | .store-name { | 397 | .store-name { |
| @@ -391,6 +399,10 @@ $basicBtnC:#eb0313; | @@ -391,6 +399,10 @@ $basicBtnC:#eb0313; | ||
| 391 | color: $mainFontC; | 399 | color: $mainFontC; |
| 392 | } | 400 | } |
| 393 | .store-link { | 401 | .store-link { |
| 402 | + position: absolute; | ||
| 403 | + right: 0; | ||
| 404 | + top: 1px; | ||
| 405 | + padding-right: pxToRem(30px); | ||
| 394 | font-size: pxToRem(28px); | 406 | font-size: pxToRem(28px); |
| 395 | color: $subFontC; | 407 | color: $subFontC; |
| 396 | text-align: right; | 408 | text-align: right; |
-
Please register or login to post a comment