fe / YOHO-ACTIVITY-PHP · Commits

Go to a project

Authored by Lynnic
Commit 71ae8a381446dac40daa81ed31d4f7ac09e7c737 1 parent 91b9ef89

update

Inline Side-by-side
Showing 4 changed files with 42 additions and 9 deletions
... ... @@ -35,7 +35,7 @@ $basicBtnC:#eb0313;
.page-block {
box-sizing: border-box;
width: 100%;
border-bottom: 2px solid $borderC;
border-bottom: 1px solid $borderC;
border-top: 1px solid $borderC;
padding: 0 pxToRem(28px);
>.title {
... ...
... ... @@ -36,11 +36,37 @@
}
}
}
.material-type {
width: pxToRem(581px);
height: pxToRem(99px);
border-top: 1px solid $borderC;
padding: pxToRem(17px) 0;
// .material-type {
// width: pxToRem(581px);
// height: pxToRem(99px);
// border-top: 1px solid $borderC;
// padding: pxToRem(17px) 0;
// }
}
.wash-tips{
padding-top:pxToRem(18px);
&.page-block{
border-top: none;
padding-left: pxToRem(15px);
padding-right: pxToRem(15px);
}
// padding-bottom:pxToRem(18px);
.tip{
// width: pxToRem(73px);
width: 16.666%;
display: inline-block;
// margin-right: pxToRem(24px);
img{
width: pxToRem(48px);
height: pxToRem(48px);
margin-bottom: pxToRem(10px);
}
.caption{
display: block;
font-size: pxToRem(18px);
line-height: pxToRem(22px);
margin-bottom: pxToRem(18px);
}
}
}
.product-detail {
... ...
... ... @@ -113,9 +113,16 @@
</div>
{{/materials}}
<div class="wash-tips page-block">
{{#washTips}}
<div class="tip">
<img src="{{img}}" alt="">
<span class="caption">{{caption}}</span>
</div>
{{/washTips}}
</div>
{{#washTips}}
<!-- {{#washTips}}
<div class="icons-wrapper washTips page-block">
<ul class="icons-list clearfix">
{{#list}}
... ... @@ -123,7 +130,7 @@
{{/list}}
</ul>
</div>
{{/washTips}}
{{/washTips}} -->
<div class="gap-block"></div>
... ...