Merge remote-tracking branch 'origin/szzh' into szzh

2015-03-17 10:09:01 +08:00 · 2015-03-17 10:09:01 +08:00 · c3ea741404
parent bfc9cdb3a4 56b331219d
commit c3ea741404
1 changed files with 1 additions and 1 deletions
--- a/public/themes/redpenny-master/stylesheets/application.css
+++ b/public/themes/redpenny-master/stylesheets/application.css
@ -488,7 +488,7 @@ color: #000000;
  background:#fff; /*主题框架背景yanse*/
  margin-bottom: 30px;
  border-right:1px solid #C6E9F1;
-  overflow:auto;
+  /*overflow:auto;*/
  word-wrap:break-word;
  /*by young*/
  -moz-box-shadow:#C6E9F1 1px 1px 2px;