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
uedxwg
2015-12-21 22:46:42 +0800
Commit
c9595bba6ec05846e3eb08cb4e1f5911f24ffb07
2 parents
a2d16ddb
21f407a0
Merge branch 'develop' of
http://git.dev.yoho.cn/web/yohobuy
into develop
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
7 deletions
static/js/cart/select-coupon.js
static/sass/cart/_order-ensure.scss
static/sass/cart/_select-coupon.scss
static/js/cart/select-coupon.js
View file @
c9595bb
...
...
@@ -191,8 +191,8 @@ function getCouponDate() {
getCouponDate
();
$
(
window
).
scroll
(
function
()
{
if
(
$
(
window
).
scrollTop
()
+
$
(
window
).
height
()
>
$
(
'body'
).
height
()
*
0.9
)
{
getCouponDate
();
}
});
// $(window).scroll(function() {
// if ($(window).scrollTop() + $(window).height() > $('body').height() * 0.9) {
// getCouponDate();
// }
// });
...
...
static/sass/cart/_order-ensure.scss
View file @
c9595bb
...
...
@@ -185,7 +185,7 @@
height
:
pxToRem
(
60px
);
color
:
#444
;
background
:
#efefef
;
font-size
:
pxToRem
(
16
px
);
font-size
:
pxToRem
(
24
px
);
line-height
:
1
;
outline
:
0
;
border
:
0
;
...
...
static/sass/cart/_select-coupon.scss
View file @
c9595bb
...
...
@@ -61,7 +61,7 @@
position
:
relative
;
margin-top
:
pxToRem
(
30px
);
margin-bottom
:
pxToRem
(
30px
);
font-size
:
pxToRem
(
14
px
);
font-size
:
pxToRem
(
28
px
);
line-height
:
2
;
color
:
#b0b0b0
;
text-align
:
center
;
...
...
Please
register
or
login
to post a comment