Authored by yyq

fix style

... ... @@ -209,7 +209,7 @@ export default {
background: #f0f0f0;
padding: 20px;
box-sizing: border-box;
font-size: 24px;
font-size: 28px;
color: #444;
line-height: 34px;
margin-top: 20px;
... ...
... ... @@ -58,6 +58,7 @@ export default {
right: 0;
bottom: 0;
z-index: 1;
overflow-y: visible;
}
/deep/ .layout-header {
... ...
... ... @@ -39,6 +39,7 @@ export default {
watch: {
'data.intro': function() {
this.introHeight = 0;
this.introCollapseHeight = 0;
this.updateHeight();
}
},
... ... @@ -47,8 +48,6 @@ export default {
return (this.data.maxLines || MAX_LINES) - 1;
},
trimIntro() {
this.introHeight = 0;
this.introCollapseHeight = 0;
return trim(this.data.intro);
},
showIntro() {
... ... @@ -61,12 +60,12 @@ export default {
textArr[line] = textArr[line] || '';
textArr[line] += val;
if (textArr[line].length >= 24 || isEnter) {
if (textArr[line].length >= 21 || isEnter) {
line++;
}
if (line > this.maxLines) {
textArr[this.maxLines] = textArr[this.maxLines].substring(0, Math.min(21, textArr[this.maxLines].length));
textArr[this.maxLines] = textArr[this.maxLines].substring(0, Math.min(17, textArr[this.maxLines].length));
return false;
}
});
... ... @@ -120,7 +119,7 @@ export default {
methods: {
updateHeight() {
this.$nextTick(() => {
this.introHeight = get(this.$refs, 'introPool.scrollHeight', 0) + 20;
this.introHeight = get(this.$refs, 'introPool.scrollHeight', 0) + 22;
this.introCollapseHeight = get(this.$refs, 'intro.offsetHeight', 0);
});
},
... ... @@ -130,7 +129,7 @@ export default {
}
if (!this.canRetract) {
this.canRetract = this.introHeight - 21 > get(this.$refs, 'expand.offsetHeight', 0) * (this.maxLines + 4);
this.canRetract = this.introHeight - 23 > get(this.$refs, 'expand.offsetHeight', 0) * (this.maxLines + 4);
}
this.isIntroExpand = !this.isIntroExpand;
... ... @@ -154,10 +153,9 @@ export default {
transition: height 250ms cubic-bezier(0.165, 0.84, 0.44, 1);
.intro-content {
line-height: 48px;
font-size: 28px;
line-height: 1.7;
font-size: 32px;
color: #4a4a4a;
letter-spacing: 0.06PX;
box-sizing: content-box;
position: relative;
}
... ... @@ -192,15 +190,16 @@ export default {
.collapse {
width: 100%;
text-align: right;
font-size: 28px;
font-size: 32px;
color: #000;
font-weight: bold;
}
.expand {
font-size: 28px;
font-size: 32px;
color: #000;
line-height: 20px;
white-space: nowrap;
&.collapse {
position: absolute;
... ...
... ... @@ -319,15 +319,15 @@ export default {
}
.context-title {
font-size: 34px;
font-size: 40px;
color: #222;
line-height: 52px;
margin-bottom: 10px;
line-height: 1.7;
margin-bottom: 30px;
font-weight: 700;
}
.context-rich-text /deep/ {
font-size: 28px;
font-size: 32px!important;
line-height: 1.8!important;
* {
... ... @@ -341,15 +341,15 @@ export default {
}
h1 {
font-size: 32px!important;
font-size: 38px!important;
}
h2 {
font-size: 30px!important;
font-size: 36px!important;
}
h3 {
font-size: 28px!important;
font-size: 34px!important;
}
img {
... ... @@ -358,10 +358,10 @@ export default {
}
p {
font-size: 28px!important;
font-size: 32px!important;
* {
font-size: 28px!important;
font-size: 32px!important;
letter-spacing: normal!important;
}
}
... ...
... ... @@ -555,6 +555,13 @@ export default {
opacity: 0;
transition: opacity 300ms ease-in-out;
/deep/ .identity-icon {
width: 35%;
height: 35%;
right: -4%;
bottom: -4%;
}
&.avatar-opacity {
opacity: 1;
}
... ...
... ... @@ -15,10 +15,11 @@
(function(d,c){var e=d.documentElement,a="orientationchange" in window?"orientationchange":"resize",b=function(){var f=e.clientWidth;if(!f){return}if(f>=750){e.style.fontSize="40px"}else{e.style.fontSize=40*(f/750)+"px"}};if(!d.addEventListener){return}b();c.addEventListener(a,b,false);d.addEventListener("DOMContentLoaded",b,false)})(document,window);
</script>
<link rel="dns-prefetch" href="//cdn.yoho.cn">
<link rel="dns-prefetch" href="//img10.static.yhbimg.com">
<link rel="dns-prefetch" href="//img11.static.yhbimg.com">
<link rel="dns-prefetch" href="//img12.static.yhbimg.com">
<link rel="dns-prefetch" href="//img13.static.yhbimg.com">
<link rel="dns-prefetch" href="imgsocial.yohobuy.com">
<link rel="dns-prefetch" href="flv01.static.yhbimg.com">
<link rel="dns-prefetch" href="img12.static.yhbimg.com ">
<link rel="dns-prefetch" href="img13.static.yhbimg.com">
<link rel="dns-prefetch" href="imgboys1.yohobuy.com">
{{{resources}}}
{{{styles}}}
</head>
... ...