resolved user.rb conflict

[rails.git] / public / stylesheets / site.css

diff --git a/public/stylesheets/site.css b/public/stylesheets/site.css
index d49b603ad5894a472bb61dd00b8debe466f8de9a..d1834fbced74e7e2aeafe1512350d1fb8e7ab633 100644 (file)
--- a/public/stylesheets/site.css
+++ b/public/stylesheets/site.css
@@ -146,7 +146,7 @@ body {
 \r
 \r
 #content {\r
- /* width: 700px; */\r
+  /* width: 700px; */\r
   padding: 0;\r
   /*padding-left: 1em;*/\r
   margin: 0;\r
@@ -289,8 +289,31 @@ hides rule from IE5-Mac \*/
   font-size: 12px;\r
   padding-top: 5px;\r
   padding-left: 14px;\r
+  padding-bottom: 15px;\r
+  width: 700px;\r
+}\r
+\r
+#placename-helper{\r
+  font-size: 9px;\r
+  position:absolute; top:20px; left: 250px;\r
+  color: gray;\r
+}\r
+\r
+#postcode-helper{\r
+  font-size: 9px;\r
+  position:absolute; top:20px; left: 20px;\r
+  color: gray;\r
+}\r
+\r
+#geocoder-attribution{\r
+  font-size: 9px;\r
+  position:absolute; top:26px; left: 450px;\r
+  line-height: 8px;\r
+  color: gray;\r
 }\r
 \r
+\r
+\r
 .gpxsummary {\r
   font-size: 12px;\r
   color: gray;\r
@@ -407,5 +430,5 @@ hides rule from IE5-Mac \*/
 }\r
 \r
 input {\r
- border: 1px solid black;\r
+  border: 1px solid black;\r
 }\r