Toggle navigation
Toggle navigation
This project
Loading...
Sign in
fe
/
YOHOBUYWAP
·
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
whb
9 years ago
Commit
34fea4cec6a1d1b14a2d12bdbe3ffb02a3ea7c12
2 parents
1da0dc94
b41691d2
Merge branch 'develop' of
http://git.dev.yoho.cn/web/yohobuy
into develop
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
15 additions
and
6 deletions
static/js/category/brand.js
static/sass/cart/_index.scss
static/sass/category/_brand.scss
web-static/sass/home/_index.scss
static/js/category/brand.js
View file @
34fea4c
...
...
@@ -166,19 +166,21 @@ if ($('.brand-search-page').length) {
$keyword
.
on
(
'input'
,
function
()
{
if
(
$keyword
.
val
().
length
)
{
$icon
.
css
(
'color'
,
'#000'
);
$
(
this
).
closest
(
'.search-box'
).
css
(
'width'
,
'11.25rem'
);
$icon
.
css
(
'color'
,
'#444'
);
// $(this).closest('.search-box').css('width', '11.25rem');
$searchAction
.
show
().
find
(
'.clear-text'
).
show
();
}
else
{
$icon
.
css
(
'color'
,
'#b2b2b2'
);
$
(
this
).
closest
(
'.search-box'
).
css
(
'width'
,
'12.5rem'
);
$searchAction
.
hide
();
// $(this).closest('.search-box').css('width', '12.5rem');
$searchAction
.
find
(
'.clear-text'
).
hide
();
}
searchResult
();
}).
focus
();
// 2016.1.13 产品(高扬)要求进入页面默认显示取消按钮
$icon
.
css
(
'color'
,
'#
000
'
);
$icon
.
css
(
'color'
,
'#
444
'
);
$keyword
.
closest
(
'.search-box'
).
css
(
'width'
,
'11.25rem'
);
$searchAction
.
show
().
find
(
'.clear-text'
).
hide
();
...
...
static/sass/cart/_index.scss
View file @
34fea4c
...
...
@@ -202,7 +202,7 @@
li
:before
{
content
:
""
;
display
:
inline-block
;
margin-right
:
2
0rem
/
$pxConvertRem
;
margin-right
:
1
0rem
/
$pxConvertRem
;
width
:
8rem
/
$pxConvertRem
;
height
:
8rem
/
$pxConvertRem
;
background-color
:
#000
;
...
...
static/sass/category/_brand.scss
View file @
34fea4c
...
...
@@ -129,6 +129,7 @@
display
:
inline
;
font-size
:
28rem
/
$pxConvertRem
;
vertical-align
:
middle
;
color
:
#444
;
}
.clear-text
{
...
...
web-static/sass/home/_index.scss
View file @
34fea4c
...
...
@@ -248,6 +248,12 @@
.slide-wrapper
{
height
:
100%
;
li
{
a
{
width
:
100%
;
}
}
}
.slide-switch
{
...
...
Please
register
or
login
to post a comment