Merge branch 'master' into routing

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index b7ba464c0cdea8296ebcc0c6c1b1d58f399cda7a..740305cd3ed64a02ad29193bbaed439c3a7f5c11 100644 (file)
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -1973,6 +1973,7 @@ input[type="email"],
 input[type="url"],
 input[type="password"],
 textarea {
+  color: #222;
   background-color: #fff;
   border: 1px solid #ccc;
   padding: 2px 5px;