Merge branch 'master' into openstreetbugs

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

diff --git a/public/stylesheets/common.css b/public/stylesheets/common.css
index 509fce0e81e1edfef4c551de87956c28c2035877..9b68bd03e28e03068c194de04187acfacf06fd8f 100644 (file)
--- a/public/stylesheets/common.css
+++ b/public/stylesheets/common.css
@@ -85,7 +85,9 @@ hr {
   -moz-border-radius: 5px;
 }
 
-#intro p { margin: 5px; }
+#intro p {
+  margin: 5px;
+}
 
 /*
  * Rules for alert boxes shown in the left sidebar when important
@@ -100,7 +102,6 @@ hr {
   border: 1px solid #ccc;
   background: #d00;
   line-height: 1.2em;
-  text-align: left;
   font-size: 14px;
   border-radius: 5px;
   -moz-border-radius: 5px;
@@ -119,7 +120,6 @@ hr {
   border: 1px solid #ccc;
   background: #ea0;
   line-height: 1.2em;
-  text-align: left;
   font-size: 14px;
   border-radius: 5px;
   -moz-border-radius: 5px;
@@ -133,10 +133,8 @@ hr {
   margin: 5px;
   padding: 5px;
   border: 1px solid #ccc;
-  left: 0px;
   background: #ddd;
   line-height: 1.2em;
-  text-align: Left;
   font-size: 14px;
   font-weight: bold;
   border-radius: 5px;
@@ -145,18 +143,14 @@ hr {
 
 .left_menu td {
   font-size: 12px;
-  padding-right: 4px;
 }
 
 .left_menu h1 {
   font-style: normal;
   font-size: 15px;
-  padding: 0em 0em 0em 1em;
-  text-align: left;
 }
 
 .left_menu ul {
-  padding-left: 0px;
   margin: 0px;
   list-style-type: none;
 }
@@ -166,10 +160,6 @@ hr {
   padding: 0px;
 }
 
-.left_menu img {
-  margin: 2px 8px 0px 0px;
-}
-
 .left_menu a {
   color: #000;
 }
@@ -197,9 +187,7 @@ hr {
   margin: 5px;
   padding: 5px;
   border: 1px solid #ccc;
-  left: 0px;
   line-height: 1.2em;
-  text-align: left;
   font-size: 12px;
   background: #eee;
   border-radius: 5px;
@@ -219,10 +207,9 @@ hr {
 .whereami {
   line-height: 22px;
   vertical-align: bottom;
-  float: right;
 }
 
-.search_form {
+.search_container {
   height: 16px;
   padding-bottom: 6px;
 }
@@ -278,7 +265,6 @@ hr {
 {
   height: 20px;
   margin: 0px;
-  padding-left: 215px;
   padding-top: 5px;
   background: url('../images/tab_bottom.gif') repeat-x bottom;
 }
@@ -293,13 +279,11 @@ hr {
 
 #tabnav a, #tabnav a:link, #tabnav a:visited 
 {
-  float: left;
   background: #f3f3f3;
   font-size: 13px;
   line-height: 14px;
   font-weight: bold;
   padding: 2px 10px;
-  margin-right: 4px;
   border: 1px solid #ccc;
   text-decoration: none;
   color: #333;
@@ -331,10 +315,8 @@ hr {
 /* Rules for greeting bar in the top right corner */
 
 #greeting {
-  float: right;
   height: 20px;
   margin: 0px;
-  padding-right: 10px;
   padding-top: 5px;
   font-size: 13px;
   line-height: 14px;
@@ -351,20 +333,14 @@ hr {
   z-index: 20000000;
   position: absolute;
   top: 15px;
-  left: 15px
 }
 
 /* Rules for OpenLayers maps */
 
 #map {
-  position: absolute;
   border: 1px solid black;
   margin: 0px; 
   padding: 0px;
-  left: 0px;
-  right: 2px;
-  top: 0px;
-  bottom: 0px;
 }
 
 .olControlAttribution {
@@ -376,13 +352,13 @@ hr {
   position: absolute;
   bottom: 15px;
   right: 15px;
-  font-size: smaller;
   text-align: right;
+  font-size: smaller;
 }
 
 /* Rules for edit menu */
 
-#editmenu {
+.menu {
   display: none;
   z-index: 10000;
   position: absolute;
@@ -390,15 +366,16 @@ hr {
   border: 1px solid black;
 }
 
-#editmenu ul {
+.menu ul {
   margin-top: 10px;
   margin-bottom: 10px;
   padding-left: 10px;
   padding-right: 10px;
 }
 
-#editmenu li {
+.menu li {
   list-style-type: none;
+  white-space: nowrap;
 }
 
 /* Rules for attribution text under the main map shown on printouts */
@@ -407,6 +384,10 @@ hr {
   display: none;
 }
 
+.attribution_notice {
+  text-align: center;
+}
+
 /* Rules for the popout map sidebar */
 
 #sidebar {
@@ -416,12 +397,11 @@ hr {
   margin: 0px;
   padding: 0px;
   width: 30%;
-  left: 0px;
   top: 0px;
   bottom: 0px;
 }
 
-#sidebar_content {
+#sidebar #sidebar_content {
   overflow: auto;
   position: absolute;
   font-size: 13px;
@@ -432,7 +412,7 @@ hr {
   right: 0px;
 }
 
-.sidebar_title {
+#sidebar .sidebar_title {
   margin: 0px;
   padding: 3px 6px;
   height: 29px;
@@ -445,21 +425,21 @@ hr {
 /* Rules for the map key which appears in the popout sidebar */
 
 #mapkey h3 {
-    font-size: 110%;
-    font-weight: normal;
-    text-align: center;
+  font-size: 110%;
+  font-weight: normal;
+  text-align: center;
 }
 
 #mapkey .mapkey-table {
-    padding-left: 5px;
-    padding-right: 5px;
+  padding-left: 5px;
+  padding-right: 5px;
 }
 
 #mapkey .mapkey-table-key {
 }
 
 #mapkey .mapkey-table-value {
-    font-size: 90%;
+  font-size: 90%;
 }
 
 /* Rules for search results which appear in the popout sidebar */
@@ -551,10 +531,8 @@ hr {
   padding: 0px;
   margin: 0px;
   position: absolute; 
-  right: 10px;
   bottom: 10px;
   line-height: 1.2em;
-  text-align: left;
 }
 
 #slim_container {
@@ -585,10 +563,37 @@ hr {
 
 #slim_header img {
   vertical-align: middle;
-  margin-right: 5px;
   margin-bottom: 5px;
 }
 
+/* Rules for the home page */
+
+.site_index #map {
+  position: absolute;
+  top: 0px;
+  bottom: 0px;
+  left: 0px;
+  right: 0px;
+}
+
+.site_export #map {
+  position: absolute;
+  top: 0px;
+  bottom: 0px;
+  left: 0px;
+  right: 0px;
+}
+
+/* Rules for the edit page */
+
+.site_edit #map {
+  position: absolute;
+  top: 0px;
+  bottom: 0px;
+  left: 0px;
+  right: 0px;
+}
+
 /* Rules for the changeset list shown by the history tab etc */
 
 #changeset_list_container {
@@ -598,7 +603,6 @@ hr {
 #changeset_list {
   width: 50%;
   font-size: small;
-  text-align: left;
   border-collapse: collapse;
   border-width: 0px;
   margin-top: 1px;
@@ -628,11 +632,9 @@ hr {
 }
 
 #changeset_list_map {
-  float: right;
   position: absolute;
   top: 0px;
   bottom: 0px;
-  right: 0px;
   width: 49%;
   min-height: 400px;
   border: solid 1px black;
@@ -641,21 +643,33 @@ hr {
 /* Rules for the data browser */
 
 #browse_navigation {
-  float: right;
   width: 250px;
   text-align: center;
-  margin-left: 10px;
 }
 
 table.browse_details th {
   white-space: nowrap;
 }
 
+td.browse_comments {
+  padding: 0px;
+}
+
+td.browse_comments table {
+  border-collapse: collapse;
+}
+
+td.browse_comments table td {
+  padding-bottom: 10px;
+}
+
+td.browse_comments table td span.by {
+  font-size: small;
+  color: #999999;
+}
+
 #browse_map {
-  float: right;
   width: 250px;
-  text-align: right;
-  margin-left: 10px;
 }
 
 #browse_map #small_map {
@@ -664,11 +678,14 @@ table.browse_details th {
   border: solid 1px black;
 }
 
+#browse_map .geolink {
+  display: none;
+}
+
 /* Rules for the trace list shown by the traces tab etc */
 
 #trace_list {
   font-size: small;
-  text-align: left;
   border-collapse: collapse;
   border-width: 0px;
 }
@@ -678,6 +695,26 @@ table.browse_details th {
   color: gray;
 }
 
+#trace_list .trace_pending {
+  color: red;
+}
+
+#trace_list .trace_public {
+  color: green;
+}
+
+#trace_list .trace_identifiable {
+  color: green;
+}
+
+#trace_list .trace_trackable {
+  color: red;
+}
+
+#trace_list .trace_private {
+  color: red;
+}
+
 /* Rules for the user list */
 
 #user_list {
@@ -695,10 +732,18 @@ table.browse_details th {
 }
 
 #user_list_actions {
-  float: right;
   margin-top: 10px;
 }
 
+/* Rules for the new diary entry page */
+
+.diary_entry div#map {
+  position: relative;
+  width: 90%;
+  height: 400px;
+  display: none;
+}
+
 /* Rules for the login page */
 
 #login_wrapper div {
@@ -708,10 +753,6 @@ table.browse_details th {
   -moz-border-radius: 15px;
 }
 
-#login_wrapper input[type=submit] {
-  float: right;
-}
-
 #login_login {
   background-color: #f5f5ff;
   border: 1px solid #f3f3ff;
@@ -749,7 +790,7 @@ div#contributorTerms {
   border: 1px solid black;
   padding: 4px;
   overflow: auto;
-  width: 80%;
+  width: 95%;
   height: 400px;
 }
 
@@ -777,7 +818,7 @@ div#contributorTerms img {
 }
 
 form#termsForm {
-  width: 80%;
+  width: 95%;
   margin-bottom: 3em;
 }
 
@@ -785,12 +826,12 @@ div#slim_content form#termsForm {
   width: auto;
 }
 
-form#termsForm div#buttons {
-  float: right;
-}
-
-form#termsForm input#agree {
-  margin-left: 50px;
+p#contributorGuidance {
+  background-color: #f5f5ff;
+  border: 1px solid #f3f3ff;
+  border-radius: 15px;
+  -moz-border-radius: 15px;
+  padding: 10px;
 }
 
 /* Rules for the account settings page */
@@ -799,6 +840,12 @@ form#termsForm input#agree {
   padding-bottom: 10px;
 }
 
+#accountForm .user_map {
+  position: relative;
+  width: 500px;
+  height: 400px; 
+}
+
 #accountImage td {
   padding-bottom: 0px;
 }
@@ -815,6 +862,27 @@ form#termsForm input#agree {
   display: inline !important;
 }
 
+#accountForm input[type=submit] {
+  margin-top: 15px;
+}
+
+/* Rules for the user view */
+
+.user_view .user_map {
+  position: relative;
+  width: 400px;
+  height: 400px; 
+}
+
+.user_view .user_map p#no_home_location {
+  position: absolute;
+  top: 0px;
+  bottom: 0px;
+  width: 90%;
+  height: 30%;
+  margin: auto 5%
+}
+
 /* Rules for the user map */
 
 .user_map .olControlPanZoomBar {
@@ -836,6 +904,10 @@ form#termsForm input#agree {
   margin-right: 2px;
 }
 
+.user_popup img.user_thumbnail {
+  float: left;
+}
+
 /* Rules for message in/out box page */
 
 #messages {
@@ -895,9 +967,7 @@ form#termsForm input#agree {
 }
 
 #errorExplanation h2 {
-  text-align: left;
   font-weight: bold;
-  padding: 5px 5px 5px 15px;
   font-size: 12px;
   margin: -7px;
   background-color: #c00;
@@ -918,7 +988,7 @@ form#termsForm input#agree {
 /* Rules for forms */
 
 .fieldName {
-  text-align: right;
+  vertical-align: top;
   font-weight: bold;
 }
 
@@ -934,11 +1004,6 @@ input[type="submit"] {
   border: 1px solid black;
 }
 
-input.openid_url { 
-  background: url('../images/openid_input.png') repeat-y left white;
-  padding-left: 16px;
-}
-
 /* Rules for user images */
 
 img.user_image {