Toggle navigation
Toggle navigation
This project
Loading...
Sign in
fe
/
YOHO-ACTIVITY-PHP
·
Commits
Go to a project
GitLab
Go to group
Project
Activity
Files
Commits
Pipelines
0
Builds
0
Graphs
Milestones
Issues
0
Merge Requests
0
Members
Labels
Wiki
Forks
Network
Create a new issue
Download as
Plain Diff
Browse Files
Authored by
ccbikai
2015-11-03 17:07:45 +0800
Commit
4b1afed1fa32c461c0c6d754c002c9b1731cc1da
2 parents
48ffd5ae
0af66d09
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
4 additions
and
2 deletions
framework
static/js/category/brand.js
static/sass/category/_brand.scss
framework
@
75bbc3b0
Subproject commit
119c247f5cf929aa1e059e40609bb16dd6b58f05
Subproject commit
75bbc3b075de19f239532f60c5995d06c5f814e2
...
...
static/js/category/brand.js
View file @
4b1afed
...
...
@@ -197,6 +197,8 @@ if ($('.brand-search-page').length) {
$
(
'<a href="'
+
content
.
searchHref
+
'">'
+
content
.
searchName
+
'</a>'
).
appendTo
(
'.historyList'
);
});
}
}
else
{
$
(
'.history'
).
css
(
'display'
,
'none'
);
}
removeHistory
=
new
Hammer
(
$
(
'.removeHistory'
)[
0
]);
...
...
static/sass/category/_brand.scss
View file @
4b1afed
...
...
@@ -6,7 +6,7 @@
padding
:
14rem
/
$pxConvertRem
3
.125%
;
background-color
:
#f8f8f8
;
left
:
0
;
top
:
88
rem
/
$pxConvertRem
;
top
:
90
rem
/
$pxConvertRem
;
position
:
fixed
;
z-index
:
2
;
...
...
Please
register
or
login
to post a comment