Toggle navigation
Toggle navigation
This project
Loading...
Sign in
fe
/
yoho-blk
·
Commits
Go to a project
GitLab
Go to group
Project
Activity
Files
Commits
Pipelines
0
Builds
0
Graphs
Milestones
Issues
0
Merge Requests
1
Members
Labels
Wiki
Forks
Network
Create a new issue
Download as
Plain Diff
Browse Files
Authored by
yyq
2016-08-16 10:08:24 +0800
Commit
980fe54d236d2027c9a4e94c5f841938bcde35c5
2 parents
f9916041
cc83ae95
Merge branch 'release/1.0' of git.yoho.cn:fe/yoho-blk into release/1.0
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
5 additions
and
8 deletions
apps/brand/models/brand.js
public/scss/channel/_brand-text-box.css
public/scss/channel/_editorial.css
public/scss/channel/_new-arrival.css
public/scss/channel/_style-icon.css
apps/brand/models/brand.js
View file @
980fe54
...
...
@@ -38,8 +38,6 @@ const _processListData = (list) => {
}
});
console
.
log
(
list
)
listKey
.
sort
();
listKey
.
push
(
'0-9'
);
...
...
public/scss/channel/_brand-text-box.css
View file @
980fe54
.brand-text-box
{
$
size
:
1
8
px
;
$
size
:
1
4
px
;
$
line-height
:
1.8
;
$
lines-to-show
:
3
;
...
...
@@ -13,7 +13,7 @@
h4
{
height
:
18px
;
line-height
:
18px
;
padding-right
:
1
0px
;
padding-right
:
2
0px
;
display
:
-webkit-box
;
font-size
:
16px
;
font-weight
:
bold
;
...
...
@@ -26,7 +26,7 @@
display
:
-webkit-box
;
height
:
calc
(
$
size
*$
line-height
*$
lines-to-show
);
margin
:
25px
0
;
padding-right
:
2
5
px
;
padding-right
:
2
0
px
;
font-size
:
$
size
;
line-height
:
$
line-height
;
overflow
:
hidden
;
...
...
public/scss/channel/_editorial.css
View file @
980fe54
...
...
@@ -33,7 +33,7 @@
min-height
:
50px
;
padding
:
$
space
;
position
:
absolute
;
bottom
:
2px
;
bottom
:
0
;
background-color
:
rgba
(
0
,
0
,
0
,
0.5
);
color
:
#fff
;
font-size
:
14px
;
...
...
public/scss/channel/_new-arrival.css
View file @
980fe54
...
...
@@ -25,7 +25,7 @@
@extend
.cursor-pointer;
padding-bottom
:
3px
;
border-bottom
:
1
px
solid
#000
;
border-bottom
:
2
px
solid
#000
;
&.top
{
line-height
:
30px
;
...
...
public/scss/channel/_style-icon.css
View file @
980fe54
...
...
@@ -51,7 +51,6 @@
margin
:
15px
0
;
padding-right
:
$
space
;
font-size
:
$
size
;
font-weight
:
bold
;
line-height
:
$
line-height
;
overflow
:
hidden
;
-webkit-line-clamp
:
$
lines-to-show
;
...
...
Please
register
or
login
to post a comment