Merge branch 'master' into openstreetbugs

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

diff --git a/public/stylesheets/common.css b/public/stylesheets/common.css
index c89bbe5e4f3dd0cdc0a633fc745654a0526ef392..8b387e1d34dbc5b1555b24d5a28836e36e94b7a5 100644 (file)
--- a/public/stylesheets/common.css
+++ b/public/stylesheets/common.css
@@ -67,6 +67,12 @@ hr {
   margin: 0px;
 }
 
+/* Rules for the site name */
+
+#small-title {
+  display: none;
+}
+
 /* Rules for the introductory text displayed in the left sidebar to new users */
 
 #intro {
@@ -216,7 +222,7 @@ hr {
   float: right;
 }
 
-.search_form {
+.search_container {
   height: 16px;
   padding-bottom: 6px;
 }
@@ -557,7 +563,6 @@ hr {
 
 #slim_container_content {
   max-width: 50em;
-  height: 650px;
   background-color: #FFFFFF;
   margin: 10px auto;
   padding: 3px;
@@ -568,13 +573,14 @@ hr {
 
 #slim_content {
   margin: 10px;
-  position: absolute;
-  top: 90px;
+  margin-top: 90px;
   max-width: 50em;
 }
 
 #slim_header {
   margin: 10px;
+  position: absolute;
+  top: 0px;
 }
 
 #slim_header img {
@@ -585,12 +591,23 @@ hr {
 
 /* Rules for the changeset list shown by the history tab etc */
 
-#changeset_list, #keyvalue {
-  width: 100%;
+#changeset_list_container {
+  position: relative;
+}
+
+#changeset_list {
+  width: 50%;
   font-size: small;
   text-align: left;
   border-collapse: collapse;
   border-width: 0px;
+  margin-top: 1px;
+  margin-bottom: 1px;
+}
+
+#changeset_list td {
+  vertical-align: top;
+  padding: 3px;
 }
 
 #changeset_list .date {
@@ -605,8 +622,20 @@ hr {
   white-space: nowrap;
 }
 
-#changeset_list.th {
-  font-weight: bold;
+#changeset_list .selected {
+  background-color: rgb(255, 255, 160);
+  background-color: rgba(255, 255, 85, 0.5);
+}
+
+#changeset_list_map {
+  float: right;
+  position: absolute;
+  top: 0px;
+  bottom: 0px;
+  right: 0px;
+  width: 49%;
+  min-height: 400px;
+  border: solid 1px black;
 }
 
 /* Rules for the data browser */
@@ -618,6 +647,10 @@ hr {
   margin-left: 10px;
 }
 
+table.browse_details th {
+  white-space: nowrap;
+}
+
 #browse_map {
   float: right;
   width: 250px;
@@ -668,10 +701,6 @@ hr {
 
 /* Rules for the login page */
 
-#login_wrapper {
-  float: left; /* ensures the child divs are the same size, and only as wide as they need to be */
-}
-
 #login_wrapper div {
   margin: 5px;
   padding: 15px;
@@ -684,7 +713,10 @@ hr {
 }
 
 #login_login {
-  background-color: #f0f0f0;
+  background-color: #f5f5ff;
+  border: 1px solid #f3f3ff;
+  border-radius: 15px;
+  -moz-border-radius: 15px;
 }
 
 #login_login h1 {
@@ -702,8 +734,12 @@ div#contributorTerms {
   border: 1px solid black;
   padding: 4px;
   overflow: auto;
-  width: 80%;
-  height: 60%;
+  width: 95%;
+  height: 400px;
+}
+
+div#slim_content div#contributorTerms {
+  width: auto;
 }
 
 div#contributorTerms p#first {
@@ -726,7 +762,12 @@ div#contributorTerms img {
 }
 
 form#termsForm {
-  width: 80%;
+  width: 95%;
+  margin-bottom: 3em;
+}
+
+div#slim_content form#termsForm {
+  width: auto;
 }
 
 form#termsForm div#buttons {
@@ -737,6 +778,14 @@ 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 */
 
 #accountForm td {