Commit 24c0598659eb2d0e1cd43046712eb102cc87899b
Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev
Showing
1 changed file
with
14 additions
and
9 deletions
components/diy_goodsGroup/diy_goodsGroup.wxss
| @@ -304,7 +304,7 @@ | @@ -304,7 +304,7 @@ | ||
| 304 | .zs_wz1_2l { | 304 | .zs_wz1_2l { |
| 305 | overflow: hidden; | 305 | overflow: hidden; |
| 306 | text-overflow: ellipsis; | 306 | text-overflow: ellipsis; |
| 307 | - font-size: 30rpx; | 307 | + font-size: 28rpx; |
| 308 | white-space: nowrap; | 308 | white-space: nowrap; |
| 309 | height: 40rpx; | 309 | height: 40rpx; |
| 310 | line-height: 40rpx; | 310 | line-height: 40rpx; |
| @@ -343,7 +343,7 @@ | @@ -343,7 +343,7 @@ | ||
| 343 | .zs_wz5_2l { | 343 | .zs_wz5_2l { |
| 344 | overflow: hidden; | 344 | overflow: hidden; |
| 345 | text-overflow: ellipsis; | 345 | text-overflow: ellipsis; |
| 346 | - font-size: 30rpx; | 346 | + font-size: 24rpx; |
| 347 | white-space: nowrap; | 347 | white-space: nowrap; |
| 348 | margin-top: 10rpx; | 348 | margin-top: 10rpx; |
| 349 | } | 349 | } |
| @@ -428,8 +428,9 @@ | @@ -428,8 +428,9 @@ | ||
| 428 | 428 | ||
| 429 | .zs_wz1_3l { | 429 | .zs_wz1_3l { |
| 430 | margin-bottom: 10rpx; | 430 | margin-bottom: 10rpx; |
| 431 | - font-size: 30rpx; | ||
| 432 | - height: 80rpx; | 431 | + font-size: 28rpx; |
| 432 | + height: 70rpx; | ||
| 433 | + line-height: 35rpx; | ||
| 433 | width: 220rpx; | 434 | width: 220rpx; |
| 434 | overflow: hidden; | 435 | overflow: hidden; |
| 435 | text-overflow: ellipsis; | 436 | text-overflow: ellipsis; |
| @@ -440,7 +441,7 @@ | @@ -440,7 +441,7 @@ | ||
| 440 | 441 | ||
| 441 | .zs_wz2_3l { | 442 | .zs_wz2_3l { |
| 442 | margin-bottom: 10rpx; | 443 | margin-bottom: 10rpx; |
| 443 | - font-size: 30rpx; | 444 | + font-size: 26rpx; |
| 444 | height: 70rpx; | 445 | height: 70rpx; |
| 445 | line-height: 30rpx | 446 | line-height: 30rpx |
| 446 | } | 447 | } |
| @@ -464,7 +465,7 @@ | @@ -464,7 +465,7 @@ | ||
| 464 | .zs_wz5_3l { | 465 | .zs_wz5_3l { |
| 465 | overflow: hidden; | 466 | overflow: hidden; |
| 466 | text-overflow: ellipsis; | 467 | text-overflow: ellipsis; |
| 467 | - font-size: 30rpx; | 468 | + font-size: 24rpx; |
| 468 | white-space: nowrap; | 469 | white-space: nowrap; |
| 469 | } | 470 | } |
| 470 | 471 | ||
| @@ -524,10 +525,15 @@ | @@ -524,10 +525,15 @@ | ||
| 524 | font-size: 24rpx; | 525 | font-size: 24rpx; |
| 525 | } | 526 | } |
| 526 | 527 | ||
| 528 | +.fs24 { | ||
| 529 | + font-size: 22rpx; | ||
| 530 | +} | ||
| 527 | .fs35 { | 531 | .fs35 { |
| 528 | - font-size: 35rpx; | 532 | + font-size: 30rpx; |
| 529 | } | 533 | } |
| 530 | 534 | ||
| 535 | +.fs28{ font-size: 28rpx;} | ||
| 536 | + | ||
| 531 | .xc-wc { | 537 | .xc-wc { |
| 532 | align-items: center; | 538 | align-items: center; |
| 533 | margin-top: -3rpx; | 539 | margin-top: -3rpx; |
| @@ -808,6 +814,5 @@ top: 10rpx; | @@ -808,6 +814,5 @@ top: 10rpx; | ||
| 808 | position: absolute; | 814 | position: absolute; |
| 809 | right: 0rpx; | 815 | right: 0rpx; |
| 810 | bottom: 10rpx; | 816 | bottom: 10rpx; |
| 811 | -} | ||
| 812 | 817 | ||
| 813 | -.s_prom{ margin-left: -8rpx} | ||
| 814 | \ No newline at end of file | 818 | \ No newline at end of file |
| 819 | +} | ||
| 815 | \ No newline at end of file | 820 | \ No newline at end of file |