Toggle navigation
Toggle navigation
This project
Loading...
Sign in
wangshusheng
/
YOHOBUYPC
·
Commits
Go to a project
GitLab
Go to dashboard
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
Rock Zhang
2015-10-15 11:37:55 +0800
Commit
0e4ca9d60162bcf38c1a1b5e8532cadeab58bcea
2 parents
8a5ca8cb
c18dceea
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
3 deletions
static/sass/homepage/_trendsetter-collocation.scss
template/m.yohobuy.com/partials/layout/use.phtml
static/sass/homepage/_trendsetter-collocation.scss
View file @
0e4ca9d
...
...
@@ -71,9 +71,7 @@
.recommend-list
{
position
:
relative
;
}
.recommend-item
{
.recommend-item
{
float
:
left
;
padding-left
:
30rem
/
$pxConvertRem
;
width
:
140rem
/
$pxConvertRem
;
...
...
@@ -87,4 +85,6 @@
height
:
100%
;
}
}
}
}
...
...
template/m.yohobuy.com/partials/layout/use.phtml
View file @
0e4ca9d
...
...
@@ -10,6 +10,21 @@
seajs.use('js/guang/plus-star/detail');
</script>
{
{/if
}
}
{
{#if
guangHome
}
}
<script>
seajs.use('js/guang/home');
</script>
{
{/if
}
}
{
{#if
guangList
}
}
<script>
seajs.use('js/guang/list');
</script>
{
{/if
}
}
{
{#if
guangDetail
}
}
<script>
seajs.use('js/guang/detail');
</script>
{
{/if
}
}
{
{!--
注册
--
}
}
{
{#if
regIndex
}
}
...
...
Please
register
or
login
to post a comment