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..1464c980762c87b720c10d3c69c3f5180ee03286 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 {
@@ -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 {
@@ -668,10 +674,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 +686,10 @@ hr {
 }
 
 #login_login {
-  background-color: #f0f0f0;
+  background-color: #f5f5ff;
+  border: 1px solid #f3f3ff;
+  border-radius: 15px;
+  -moz-border-radius: 15px;
 }
 
 #login_login h1 {
@@ -703,7 +708,11 @@ div#contributorTerms {
   padding: 4px;
   overflow: auto;
   width: 80%;
-  height: 60%;
+  height: 400px;
+}
+
+div#slim_content div#contributorTerms {
+  width: auto;
 }
 
 div#contributorTerms p#first {
@@ -727,6 +736,11 @@ div#contributorTerms img {
 
 form#termsForm {
   width: 80%;
+  margin-bottom: 3em;
+}
+
+div#slim_content form#termsForm {
+  width: auto;
 }
 
 form#termsForm div#buttons {