From: Tom Hughes <tom@compton.nu>
Date: Sun, 1 Feb 2015 15:10:21 +0000 (+0000)
Subject: Merge branch 'master' into routing
X-Git-Tag: live~4282^2~5^2
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/4be0e9bd103292a22bd2ca7c8f2744f33c4457d3?hp=8adb0846b4834e393eafc68406b5391d7881da83

Merge branch 'master' into routing
---

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index b7ba464c0..740305cd3 100644
--- 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;