Merge branch 'master' into openstreetbugs

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

diff --git a/public/stylesheets/common.css b/public/stylesheets/common.css
index 8d86708af780c7697daef10ed6679930411fc32d..1464c980762c87b720c10d3c69c3f5180ee03286 100644 (file)
--- a/public/stylesheets/common.css
+++ b/public/stylesheets/common.css
@@ -10,6 +10,10 @@ body {
   padding: 0px;
 }
 
+body.slim {
+  background-color: #f0f0f0;
+}
+
 /* Rules for links */
 
 a {
@@ -63,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 {
@@ -167,8 +177,12 @@ hr {
 /* Rules for SOTM advert */
 
 #sotm {
-  width: 170px;
+  width: 180px;
+  min-width: 180px;
+  margin: 5px;
   padding: 0px;
+  border: 0px;
+  background: #fff;
 }
 
 /*
@@ -543,6 +557,38 @@ hr {
   text-align: left;
 }
 
+#slim_container {
+  width: 100%;
+}
+
+#slim_container_content {
+  max-width: 50em;
+  background-color: #FFFFFF;
+  margin: 10px auto;
+  padding: 3px;
+  border-radius: 25px;
+  -moz-border-radius: 25px;
+  border: 1px solid #e6e6e6;
+}
+
+#slim_content {
+  margin: 10px;
+  margin-top: 90px;
+  max-width: 50em;
+}
+
+#slim_header {
+  margin: 10px;
+  position: absolute;
+  top: 0px;
+}
+
+#slim_header img {
+  vertical-align: middle;
+  margin-right: 5px;
+  margin-bottom: 5px;
+}
+
 /* Rules for the changeset list shown by the history tab etc */
 
 #changeset_list, #keyvalue {
@@ -626,6 +672,35 @@ hr {
   margin-top: 10px;
 }
 
+/* Rules for the login page */
+
+#login_wrapper div {
+  margin: 5px;
+  padding: 15px;
+  border-radius: 15px;
+  -moz-border-radius: 15px;
+}
+
+#login_wrapper input[type=submit] {
+  float: right;
+}
+
+#login_login {
+  background-color: #f5f5ff;
+  border: 1px solid #f3f3ff;
+  border-radius: 15px;
+  -moz-border-radius: 15px;
+}
+
+#login_login h1 {
+  margin-top: 5px;
+}
+
+#login_signup form.button-to div {
+  margin: 0px;
+  padding: 0px;
+}
+
 /* Rules for the account confirmation page */
 
 div#contributorTerms {
@@ -633,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 {
@@ -657,6 +736,11 @@ div#contributorTerms img {
 
 form#termsForm {
   width: 80%;
+  margin-bottom: 3em;
+}
+
+div#slim_content form#termsForm {
+  width: auto;
 }
 
 form#termsForm div#buttons {
@@ -727,6 +811,8 @@ form#termsForm input#agree {
   padding: 7px;
   background-color: #fff0f0;
   margin-bottom: 20px;
+  border-radius: 5px;
+  -moz-border-radius: 5px;
 }
 
 #warning {
@@ -734,6 +820,8 @@ form#termsForm input#agree {
   padding: 7px;
   background-color: #fff6f0;
   margin-bottom: 20px;
+  border-radius: 5px;
+  -moz-border-radius: 5px;
 }
 
 #notice {
@@ -741,6 +829,8 @@ form#termsForm input#agree {
   padding: 7px;
   background-color: #f0fff0;
   margin-bottom: 20px;
+  border-radius: 5px;
+  -moz-border-radius: 5px;
 }
 
 /* Rules for highlighting fields with rails validation errors */