Merge branch 'feature_student' into release/4.9.1.0

# Conflicts: # apps/product/models/detail.js # config/common.js # public/scss/common/_good.css

Merge branch 'feature_student' into release/4.9.1.0
# Conflicts: # apps/product/models/detail.js # config/common.js # public/scss/common/_good.css
weiqingting
Commit d5e56717bed3e6cd18b7ce1770765cfeab5aa5ce 1 parent 2a0c69ec
Showing 1 changed file with 2 additions and 1 deletions
public/scss/activity/_aslider.css
--- a/public/scss/activity/_aslider.css
View file @d5e5671
+++ b/public/scss/activity/_aslider.css
View file @d5e5671
@@ -410,7 +410,8 @@
     input {
       border: 0 none;
-        line-height: 100%;
+      height: 84px;
+      line-height: 84px;
     }
     .s-red {