Toggle navigation
Toggle navigation
This project
Loading...
Sign in
fe
/
YOHOBUYPC
·
Commits
Go to a project
GitLab
Go to group
Project
Activity
Files
Commits
Pipelines
0
Builds
0
Graphs
Milestones
Issues
0
Merge Requests
2
Members
Labels
Wiki
Forks
Network
Create a new issue
Download as
Plain Diff
Browse Files
Authored by
Rock Zhang
9 years ago
Commit
dcd5cb7b0a4f2a75c071cbbf282c873998dfc14f
2 parents
954f3383
e6d23944
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
15 additions
and
9 deletions
static/sass/cart/_chose-panel.scss
static/sass/cart/_good.scss
static/sass/cart/_order-ensure.scss
static/sass/cart/_select-coupon.scss
static/sass/product/_recommend-for-you.scss
template/m.yohobuy.com/partials/layout/page_header.phtml
static/sass/cart/_chose-panel.scss
View file @
dcd5cb7
...
...
@@ -162,10 +162,12 @@
}
.btn-wrap
{
position
:
relative
;
height
:
120rem
/
$pxConvertRem
;
border-top
:
1px
solid
#e6e6e6
;
padding
:
20rem
/
$pxConvertRem
;
text-align
:
center
;
background
:
#fff
;
box-sizing
:
border-box
;
.btn-sure
{
...
...
static/sass/cart/_good.scss
View file @
dcd5cb7
...
...
@@ -4,9 +4,9 @@
padding-left
:
16rem
/
$pxConvertRem
;
.prevent-img-click
{
position
:
absolute
;
width
:
20rem
/
$pxConvertRem
;
height
:
200rem
/
$pxConvertRem
;
position
:
absolute
;
background-color
:
transparent
;
z-index
:
99
;
}
...
...
static/sass/cart/_order-ensure.scss
View file @
dcd5cb7
...
...
@@ -119,13 +119,13 @@
}
.coupon-use
{
box-sizing
:
border-box
;
@include
box-sizing
(
border-box
)
;
position
:
relative
;
float
:
right
;
padding-right
:
30rem
/
$pxConvertRem
;
color
:
#999
;
text-align
:
right
;
width
:
3
6
0rem
/
$pxConvertRem
;
width
:
3
2
0rem
/
$pxConvertRem
;
white-space
:
nowrap
;
text-overflow
:
ellipsis
;
overflow
:
hidden
;
...
...
@@ -137,7 +137,7 @@
color
:
#999
;
}
}
.checkbox
{
display
:
inline-block
;
width
:
80rem
/
$pxConvertRem
;
...
...
static/sass/cart/_select-coupon.scss
View file @
dcd5cb7
...
...
@@ -6,6 +6,7 @@
margin-bottom
:
pxToRem
(
30px
);
padding-left
:
pxToRem
(
30px
);
padding-right
:
pxToRem
(
30px
);
font-size
:
pxToRem
(
24px
);
input
{
padding
:
0
pxToRem
(
12px
);
...
...
static/sass/product/_recommend-for-you.scss
View file @
dcd5cb7
.recommend-for-you
{
padding
:
pxToRem
(
30px
)
0
pxToRem
(
1
0px
);
padding
:
pxToRem
(
30px
)
0
pxToRem
(
3
0px
);
border-top
:
1px
solid
#e0e0e0
;
border-bottom
:
1px
solid
#e0e0e0
;
background
:
#fff
;
...
...
@@ -45,11 +45,13 @@
line-height
:
1
;
.sale-price
{
display
:
block
;
color
:
#d9134f
;
margin-right
:
pxToRem
(
8px
);
}
.old-price
{
display
:
block
;
color
:
#b0b0b0
;
text-decoration
:
line-through
;
}
...
...
template/m.yohobuy.com/partials/layout/page_header.phtml
View file @
dcd5cb7
...
...
@@ -15,9 +15,7 @@
{
{#
navBtn
}
}
<!--
<span
class=
"nav-btn"
>
{
{.
}
}</span>
-->
<!--
<i
class=
"iconfont nav-home"
>
638
;</i>
-->
{
{/
navBtn
}
}
</header>
<div
class=
"homebuttom none"
>
<!--
<div
class=
"homebuttom none"
>
<ul>
<li>
<i
class=
"iconfont"
>
62
a;</i>
...
...
@@ -36,5 +34,8 @@
<span>我的</span>
</li>
</ul>
</div>
</div>
-->
{
{/
navBtn
}
}
</header>
{
{/pageHeader
}
}
...
...
Please
register
or
login
to post a comment