From d5e56717bed3e6cd18b7ce1770765cfeab5aa5ce Mon Sep 17 00:00:00 2001
From: weiqingting <qingting.wei@yoho.cn>
Date: Mon, 29 Aug 2016 23:44:00 +0800
Subject: [PATCH] Merge branch 'feature_student' into release/4.9.1.0
# Conflicts:
# apps/product/models/detail.js
# config/common.js
# public/scss/common/_good.css
---
public/scss/activity/_aslider.css | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/public/scss/activity/_aslider.css b/public/scss/activity/_aslider.css
index 23345ca..0d3d01a 100644
--- a/public/scss/activity/_aslider.css
+++ b/public/scss/activity/_aslider.css
@@ -410,7 +410,8 @@
input {
border: 0 none;
- line-height: 100%;
+ height: 84px;
+ line-height: 84px;
}
.s-red {
--
libgit2 0.24.0