Merge remote-tracking branch 'origin/develop'
Showing
2 changed files
with
3 additions
and
4 deletions
@@ -88,12 +88,12 @@ | @@ -88,12 +88,12 @@ | ||
88 | position: relative; | 88 | position: relative; |
89 | float: left; | 89 | float: left; |
90 | color: #fff; | 90 | color: #fff; |
91 | - font-size: pxToRem(32px); | 91 | + font-size: pxToRem(28px); |
92 | width: pxToRem(320px); | 92 | width: pxToRem(320px); |
93 | // width: pxToRem(213px); 三栏宽度 | 93 | // width: pxToRem(213px); 三栏宽度 |
94 | - | 94 | + |
95 | p { | 95 | p { |
96 | - font-size: pxToRem(22px); | 96 | + font-size: pxToRem(24px); |
97 | } | 97 | } |
98 | 98 | ||
99 | &:after { | 99 | &:after { |
@@ -23,7 +23,6 @@ | @@ -23,7 +23,6 @@ | ||
23 | overflow: hidden; | 23 | overflow: hidden; |
24 | } | 24 | } |
25 | .user-name { | 25 | .user-name { |
26 | - float: left; | ||
27 | max-width: 240rem / $pxConvertRem; | 26 | max-width: 240rem / $pxConvertRem; |
28 | text-overflow:ellipsis; | 27 | text-overflow:ellipsis; |
29 | white-space:nowrap; | 28 | white-space:nowrap; |
-
Please register or login to post a comment