Merge branch 'master' into openstreetbugs

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

diff --git a/public/stylesheets/common.css b/public/stylesheets/common.css
index c42495718a91c03f53a1334354bb1968ddb60f22..2590c2d5f655a3d456bb320c7447643884e9b83a 100644 (file)
--- a/public/stylesheets/common.css
+++ b/public/stylesheets/common.css
@@ -280,14 +280,16 @@ hr {
   color: #000;
 }
 
-#tabnav a:link:hover
+#tabnav a:link:hover, #tabnav a:visited:hover
 {
   background: #fff;
 }
 
-#tabnav a.disabled
+#tabnav a:link.disabled, #tabnav a:visited.disabled,
+#tabnav a:link:hover.disabled, #tabnav a:visited:hover.disabled
 {
-  font-style: italic;
+  background: #bbbbbb;
+  color: white
 }
 
 /* Rules for greeting bar in the top right corner */
@@ -524,6 +526,28 @@ hr {
   font-weight: bold;
 }
 
+/* Rules for the data browser */
+
+#browse_navigation {
+  float: right;
+  width: 250px;
+  text-align: center;
+  margin-left: 10px;
+}
+
+#browse_map {
+  float: right;
+  width: 250px;
+  text-align: right;
+  margin-left: 10px;
+}
+
+#browse_map #small_map {
+  width: 250px;
+  height: 300px;
+  border: solid 1px black;
+}
+
 /* Rules for the trace list shown by the traces tab etc */
 
 #trace_list {
@@ -538,6 +562,68 @@ hr {
   color: gray;
 }
 
+/* Rules for the user list */
+
+#user_list {
+  width: 100%;
+  font-size: small;
+}
+
+#user_list tr {
+  vertical-align: center;
+}
+
+#user_list p {
+  margin-top: 0px;
+  margin-bottom: 0px;
+}
+
+#user_list_actions {
+  float: right;
+  margin-top: 10px;
+}
+
+/* Rules for the account confirmation page */
+
+div#contributorTerms {
+  border: 1px solid black;
+  padding: 4px;
+  overflow: auto;
+  width: 80%;
+  height: 60%;
+}
+
+div#contributorTerms p#first {
+  margin-top: 0px;
+}
+
+div#contributorTerms p#last {
+  margin-bottom: 0px;
+}
+
+div#contributorTerms ol {
+  margin-bottom: 0px;
+}
+
+div#contributorTerms img {
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+  margin-top: 10%;
+}
+
+form#termsForm {
+  width: 80%;
+}
+
+form#termsForm div#buttons {
+  float: right;
+}
+
+form#termsForm input#agree {
+  margin-left: 50px;
+}
+
 /* Rules for the account settings page */
 
 #accountForm td {
@@ -560,6 +646,16 @@ hr {
   display: inline !important;
 }
 
+/* Rules for the user map */
+
+.user_map .olControlPanZoomBar {
+  display: none;
+}
+
+.user_map .olControlPanZoom {
+  display: block;
+}
+
 /* Rules for user popups on maps */
 
 .user_popup p {