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
xuqi
2015-11-01 17:08:23 +0800
Commit
d9ee5c8141535fabb9892be9fcf132a4b5ad9a7c
2 parents
9db9d760
b582a5fc
Merge branch 'develop' of
http://git.dev.yoho.cn/web/yohobuy
into develop
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
13 additions
and
14 deletions
framework
static/sass/_good.scss
static/sass/product/_discount.scss
static/sass/product/_list.scss
static/sass/product/_new-arrival.scss
template/m.yohobuy.com/actions/category/brand/index.phtml
template/m.yohobuy.com/actions/category/brand/search.phtml
template/m.yohobuy.com/actions/category/class/index.phtml
template/m.yohobuy.com/actions/index/index/index.phtml
template/m.yohobuy.com/actions/product/index/index.phtml
template/m.yohobuy.com/actions/product/newsale/new.phtml
template/m.yohobuy.com/actions/product/newsale/sale.phtml
framework
@
119c247f
Subproject commit
75bbc3b075de19f239532f60c5995d06c5f814e2
Subproject commit
119c247f5cf929aa1e059e40609bb16dd6b58f05
...
...
static/sass/_good.scss
View file @
d9ee5c8
...
...
@@ -2,7 +2,7 @@
float
:
left
;
width
:
276rem
/
$pxConvertRem
;
height
:
486rem
/
$pxConvertRem
;
margin
:
0
(
15rem
/
$pxConvertRem
)
(
28
rem
/
$pxConvertRem
);
margin
:
0
(
15rem
/
$pxConvertRem
)
(
15
rem
/
$pxConvertRem
);
.tag-container
{
height
:
28rem
/
$pxConvertRem
;
...
...
static/sass/product/_discount.scss
View file @
d9ee5c8
...
...
@@ -112,6 +112,8 @@
.goods-container
{
position
:
relative
;
min-height
:
440px
;
padding-left
:
0
.375rem
;
padding-top
:
0
.2rem
;
}
}
...
...
static/sass/product/_list.scss
View file @
d9ee5c8
...
...
@@ -241,5 +241,7 @@
.goods-container
{
position
:
relative
;
min-height
:
440px
;
padding-left
:
0
.375rem
;
padding-top
:
0
.2rem
;
}
}
\ No newline at end of file
...
...
static/sass/product/_new-arrival.scss
View file @
d9ee5c8
...
...
@@ -84,6 +84,8 @@
.goods-container
{
position
:
relative
;
min-height
:
440px
;
padding-left
:
0
.375rem
;
padding-top
:
0
.2rem
;
}
}
...
...
template/m.yohobuy.com/actions/category/brand/index.phtml
View file @
d9ee5c8
...
...
@@ -83,4 +83,3 @@
</div>
</div>
{
{>
layout/footer
}
}
{
{>
layout/download_app
}
}
...
...
template/m.yohobuy.com/actions/category/brand/search.phtml
View file @
d9ee5c8
...
...
@@ -19,4 +19,3 @@
{
{{brandList
}
}}
</script>
{
{>
layout/footer
}
}
{
{>
layout/download_app
}
}
...
...
template/m.yohobuy.com/actions/category/class/index.phtml
View file @
d9ee5c8
...
...
@@ -40,5 +40,4 @@
</div>
{
{/
category
}
}
</div>
{
{>
layout/footer
}
}
{
{>
layout/download_app
}
}
\ No newline at end of file
{
{>
layout/footer
}
}
\ No newline at end of file
...
...
template/m.yohobuy.com/actions/index/index/index.phtml
View file @
d9ee5c8
...
...
@@ -24,5 +24,4 @@
</div>
</div>
</div>
{
{>
layout/footer
}
}
{
{>
layout/download_app
}
}
\ No newline at end of file
{
{>
layout/footer
}
}
\ No newline at end of file
...
...
template/m.yohobuy.com/actions/product/index/index.phtml
View file @
d9ee5c8
...
...
@@ -2,5 +2,4 @@
<div
class=
"good-list-page yoho-page"
>
{
{>
product/list
}
}
</div>
{
{>
layout/footer
}
}
{
{>
layout/download_app
}
}
\ No newline at end of file
{
{>
layout/footer
}
}
\ No newline at end of file
...
...
template/m.yohobuy.com/actions/product/newsale/new.phtml
View file @
d9ee5c8
...
...
@@ -84,5 +84,4 @@
{
{>
product/suspend-cart
}
}
</div>
{
{>
layout/footer
}
}
{
{>
layout/download_app
}
}
\ No newline at end of file
{
{>
layout/footer
}
}
\ No newline at end of file
...
...
template/m.yohobuy.com/actions/product/newsale/sale.phtml
View file @
d9ee5c8
...
...
@@ -95,5 +95,4 @@
{
{>
product/suspend-cart
}
}
</div>
{
{>
layout/footer
}
}
{
{>
layout/download_app
}
}
\ No newline at end of file
{
{>
layout/footer
}
}
\ No newline at end of file
...
...
Please
register
or
login
to post a comment