Authored by 郭成尧

Merge branch 'hotfix/product-top' into 'master'

修改在微信下商品详情返回头部按钮和首页图标重叠的问题

修改在微信下商品详情返回头部按钮和首页图标重叠的问题

See merge request !126
... ... @@ -2,28 +2,43 @@
.yoho-footer {
font-size: 28px;
}
.op-row {
padding: 0 35px;
height: 140px;
line-height: 140px;
.user-name {
margin-right: 1.17em;
margin-left: 0.35em;
max-width: 234px;
}
.back-to-top {
right: 47px;
}
.sep-line {
margin: 0 0.35em;
}
}
.copyright {
height: 140px;
line-height: 140px;
}
}
.wechat-body {
.yoho-footer {
.float-top {
&.hover {
bottom: 248px;
}
}
}
}
.yoho-footer {
position: relative;
width: 100%;
... ... @@ -64,6 +79,7 @@
margin: 0 0.3em;
}
}
.float-top {
position: absolute;
top: 47px;
... ... @@ -71,26 +87,24 @@
left: initial;
bottom: initial;
border-radius: 50%;
width: 90px;
height: 90px;
width: 88px;
height: 88px;
background: resolve("product/back-to-top.png") no-repeat;
-webkit-background-size: cover;
background-size: cover;
display: none;
/* 产品不需要动画 */
/* transition: transform 0.5s;
-webkit-transition: transform 0.5s; */
&.hover {
position: fixed;
top: initial;
left: initial;
right: 24px;
bottom: 147px;
right: 30px;
bottom: 140px;
z-index: 9999;
display: block;
}
&.animation {
&.animation {
}
}
... ... @@ -112,65 +126,67 @@
}
.float-layer {
height: 44PX;
background: rgba(68, 68, 68, 0.95);
position: fixed;
width: 100%;
bottom: 0;
left: 0;
z-index: 9999;
padding: 10PX 0;
box-sizing: content-box;
.float-layer-left {
padding-left: 22PX;
overflow: hidden;
float: left;
height: 44PX;
background: rgba(68, 68, 68, 0.95);
position: fixed;
width: 100%;
bottom: 0;
left: 0;
z-index: 9999;
padding: 10PX 0;
box-sizing: content-box;
img {
height: 44PX;
float: left;
margin-right: 10PX;
}
.float-layer-left {
padding-left: 22PX;
overflow: hidden;
float: left;
p {
float: left;
font-size: 16PX;
height: 44PX;
line-height: 44PX;
color: white;
}
img {
height: 44PX;
float: left;
margin-right: 10PX;
}
.yoho-icon {
float: left;
margin-right: 10PX;
font-size: 22PX;
line-height: 44PX;
width: 44PX;
height: 44PX;
text-align: center;
color: #fff;
border-radius: 10PX;
background-image: linear-gradient(#323232, #0f0f0f);
}
p {
float: left;
font-size: 16PX;
height: 44PX;
line-height: 44PX;
color: white;
}
.yoho-icon {
float: left;
margin-right: 10PX;
font-size: 22PX;
line-height: 44PX;
width: 44PX;
height: 44PX;
text-align: center;
color: #fff;
border-radius: 10PX;
background-image: linear-gradient(#323232, #0f0f0f);
}
}
}
#float-layer-close {
position: absolute;
left: 0;
top: 0;
width: 100px;
height: 100px;
.close-icon {
position: absolute;
left: 0;
top: 0;
color: #C0C0C0;
color: #c0c0c0;
z-index: 2;
font-size: 18PX;
}
}
#float-layer-btn {
position: absolute;
top: 50%;
... ... @@ -183,6 +199,7 @@
border-radius: 5PX;
margin-top: -13PX;
-webkit-tap-highlight-color: rgba(0, 0, 0, 0.5);
&:link,
&:visited,
&:hover,
... ... @@ -193,10 +210,9 @@
.circle-rightbottom {
position: absolute;
width: 25PX;
height: 0PX;
border:0 solid #323232;
border-bottom:25PX solid #323232;
border-radius:0 0 25PX 0;
border: 0 solid #323232;
border-bottom: 25PX solid #323232;
border-radius: 0 0 25PX;
}
... ...