resolved user.rb conflict

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

diff --git a/public/stylesheets/site.css b/public/stylesheets/site.css
index 2cd8ca412d01e8cd09e38a86f6e70ba7a14acc5f..d1834fbced74e7e2aeafe1512350d1fb8e7ab633 100644 (file)
--- a/public/stylesheets/site.css
+++ b/public/stylesheets/site.css
@@ -1,4 +1,3 @@
-\r
 a {\r
   color: #0000ff;\r
   text-decoration: none;\r
@@ -70,7 +69,7 @@ body {
   padding-top: 5px;\r
   padding-bottom: 7px;\r
   font-size: 13px;\r
-  background: url(tab_bottom.gif) repeat-x bottom;\r
+  background: url('/images/tab_bottom.gif') repeat-x bottom;\r
 }\r
 \r
 #intro {\r
@@ -146,12 +145,12 @@ body {
 }\r
 \r
 \r
-#main_area {\r
-  width: 700px;\r
+#content {\r
+  /* width: 700px; */\r
   padding: 0;\r
   /*padding-left: 1em;*/\r
   margin: 0;\r
-  position: absolute;\r
+  position: absolute; \r
   left: 192px;\r
   top: 35px;\r
   background: none;\r
@@ -167,7 +166,6 @@ body {
   text-align: center;\r
 }\r
 \r
-\r
 #mapImage {\r
   position: absolute;\r
   left: 0px;\r
@@ -176,9 +174,9 @@ body {
   top: 0px;\r
   left: 14px;\r
 }\r
+\r
 #mapEpilog {\r
   font-size: x-small;\r
-\r
 }\r
 \r
 #keyvalue {\r
@@ -246,7 +244,7 @@ hides rule from IE5-Mac \*/
   margin: 0;\r
   padding-left: 215px;\r
   padding-top: 5px;\r
-  background: url(tab_bottom.gif) repeat-x bottom;\r
+  background: url('/images/tab_bottom.gif') repeat-x bottom;\r
 }\r
 #tabnav li\r
 {\r
@@ -291,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
@@ -362,3 +383,52 @@ hides rule from IE5-Mac \*/
   cursor: pointer;\r
 }\r
 \r
+\r
+/* rails error field stuff */\r
+\r
+.fieldWithErrors {\r
+  padding: 2px;\r
+  background-color: red;\r
+  display: table;\r
+}\r
+\r
+#notice {\r
+  border: 1px solid green;\r
+  padding: 7px;\r
+  background-color: #f0fff0;\r
+  margin-bottom: 20px;\r
+}\r
+\r
+#errorExplanation {\r
+  width: 400px;\r
+  border: 2px solid red;\r
+  padding: 7px;\r
+  padding-bottom: 12px;\r
+  margin-bottom: 20px;\r
+  background-color: #f0f0f0;\r
+}\r
+\r
+#errorExplanation h2 {\r
+  text-align: left;\r
+  font-weight: bold;\r
+  padding: 5px 5px 5px 15px;\r
+  font-size: 12px;\r
+  margin: -7px;\r
+  background-color: #c00;\r
+  color: #fff;\r
+}\r
+\r
+#errorExplanation p {\r
+  color: #333;\r
+  margin-bottom: 0;\r
+  padding: 5px;\r
+}\r
+\r
+#errorExplanation ul li {\r
+  font-size: 12px;\r
+  list-style: square;\r
+}\r
+\r
+input {\r
+  border: 1px solid black;\r
+}\r