From b582a5fc45c6e6ffe5b6cead67eb1095b2629412 Mon Sep 17 00:00:00 2001
From: liangzhifeng <zhifeng.liang@yoho.cn>
Date: Sun, 1 Nov 2015 17:03:34 +0800
Subject: [PATCH] modify the css of maybelike
---
framework | 2 +-
static/sass/_good.scss | 2 +-
static/sass/product/_discount.scss | 7 ++-----
static/sass/product/_list.scss | 2 ++
static/sass/product/_new-arrival.scss | 2 ++
template/m.yohobuy.com/actions/category/brand/index.phtml | 1 -
template/m.yohobuy.com/actions/category/brand/search.phtml | 1 -
template/m.yohobuy.com/actions/category/class/index.phtml | 3 +--
template/m.yohobuy.com/actions/index/index/index.phtml | 3 +--
template/m.yohobuy.com/actions/product/index/index.phtml | 3 +--
template/m.yohobuy.com/actions/product/newsale/new.phtml | 3 +--
template/m.yohobuy.com/actions/product/newsale/sale.phtml | 3 +--
12 files changed, 13 insertions(+), 19 deletions(-)
diff --git a/framework b/framework
index 75bbc3b..119c247 160000
--- a/framework
+++ b/framework
@@ -1 +1 @@
-Subproject commit 75bbc3b075de19f239532f60c5995d06c5f814e2
+Subproject commit 119c247f5cf929aa1e059e40609bb16dd6b58f05
diff --git a/static/sass/_good.scss b/static/sass/_good.scss
index 3263921..e928b73 100644
--- a/static/sass/_good.scss
+++ b/static/sass/_good.scss
@@ -2,7 +2,7 @@
float: left;
width: 276rem / $pxConvertRem;
height: 486rem / $pxConvertRem;
- margin: 0 (15rem / $pxConvertRem) (28rem / $pxConvertRem);
+ margin: 0 (15rem / $pxConvertRem) (15rem / $pxConvertRem);
.tag-container {
height: 28rem / $pxConvertRem;
diff --git a/static/sass/product/_discount.scss b/static/sass/product/_discount.scss
index bf2536d..aa3a69c 100644
--- a/static/sass/product/_discount.scss
+++ b/static/sass/product/_discount.scss
@@ -112,11 +112,8 @@
.goods-container {
position: relative;
min-height: 440px;
-
- .container {
- padding-left: 10px;
- margin-top: 9px;
- }
+ padding-left: 0.375rem;
+ padding-top: 0.2rem;
}
}
diff --git a/static/sass/product/_list.scss b/static/sass/product/_list.scss
index 1185f65..3aa19f8 100644
--- a/static/sass/product/_list.scss
+++ b/static/sass/product/_list.scss
@@ -228,5 +228,7 @@
.goods-container {
position: relative;
min-height: 440px;
+ padding-left: 0.375rem;
+ padding-top: 0.2rem;
}
}
\ No newline at end of file
diff --git a/static/sass/product/_new-arrival.scss b/static/sass/product/_new-arrival.scss
index a3fecda..1a59d84 100644
--- a/static/sass/product/_new-arrival.scss
+++ b/static/sass/product/_new-arrival.scss
@@ -84,6 +84,8 @@
.goods-container {
position: relative;
min-height: 440px;
+ padding-left: 0.375rem;
+ padding-top: 0.2rem;
}
}
diff --git a/template/m.yohobuy.com/actions/category/brand/index.phtml b/template/m.yohobuy.com/actions/category/brand/index.phtml
index 84913f1..d0706ef 100644
--- a/template/m.yohobuy.com/actions/category/brand/index.phtml
+++ b/template/m.yohobuy.com/actions/category/brand/index.phtml
@@ -83,4 +83,3 @@
</div>
</div>
{{> layout/footer}}
-{{> layout/download_app}}
diff --git a/template/m.yohobuy.com/actions/category/brand/search.phtml b/template/m.yohobuy.com/actions/category/brand/search.phtml
index f404a34..b0cc381 100644
--- a/template/m.yohobuy.com/actions/category/brand/search.phtml
+++ b/template/m.yohobuy.com/actions/category/brand/search.phtml
@@ -19,4 +19,3 @@
{{{brandList}}}
</script>
{{> layout/footer}}
-{{> layout/download_app}}
diff --git a/template/m.yohobuy.com/actions/category/class/index.phtml b/template/m.yohobuy.com/actions/category/class/index.phtml
index 7ffe07f..7afa360 100644
--- a/template/m.yohobuy.com/actions/category/class/index.phtml
+++ b/template/m.yohobuy.com/actions/category/class/index.phtml
@@ -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
diff --git a/template/m.yohobuy.com/actions/index/index/index.phtml b/template/m.yohobuy.com/actions/index/index/index.phtml
index b3405c7..a7c0451 100644
--- a/template/m.yohobuy.com/actions/index/index/index.phtml
+++ b/template/m.yohobuy.com/actions/index/index/index.phtml
@@ -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
diff --git a/template/m.yohobuy.com/actions/product/index/index.phtml b/template/m.yohobuy.com/actions/product/index/index.phtml
index 1186baa..d5e8890 100644
--- a/template/m.yohobuy.com/actions/product/index/index.phtml
+++ b/template/m.yohobuy.com/actions/product/index/index.phtml
@@ -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
diff --git a/template/m.yohobuy.com/actions/product/newsale/new.phtml b/template/m.yohobuy.com/actions/product/newsale/new.phtml
index 971e689..5e431f8 100644
--- a/template/m.yohobuy.com/actions/product/newsale/new.phtml
+++ b/template/m.yohobuy.com/actions/product/newsale/new.phtml
@@ -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
diff --git a/template/m.yohobuy.com/actions/product/newsale/sale.phtml b/template/m.yohobuy.com/actions/product/newsale/sale.phtml
index 22091c8..ca3a522 100644
--- a/template/m.yohobuy.com/actions/product/newsale/sale.phtml
+++ b/template/m.yohobuy.com/actions/product/newsale/sale.phtml
@@ -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
--
libgit2 0.24.0