From: yomguy <yomguy@parisson.com>
Date: Thu, 5 Jul 2012 17:26:44 +0000 (+0200)
Subject: Merge branch 'dev' into feature/blue
X-Git-Tag: 0.6^2~6^2~1
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=f9db3b2ce9aeba4817c2803c9893ff71f4a5b592;p=teleforma.git

Merge branch 'dev' into feature/blue
---

f9db3b2ce9aeba4817c2803c9893ff71f4a5b592
diff --cc teleforma/static/teleforma/css/teleforma.css
index 5c3e6020,9f71f423..8e5a1e68
--- a/teleforma/static/teleforma/css/teleforma.css
+++ b/teleforma/static/teleforma/css/teleforma.css
@@@ -1397,9 -1397,9 +1397,9 @@@ input,textarea
          margin: 0em 0em 0em 0.3em;
          font-size: 0.9125em;
          background-color: #FFF;
 -        color: #0000 ;
 +        color: #000 ;
          font-weight: normal;
-         max-height: 250px;
+         max-height: 400px;
          overflow-y: auto;
          }