Fix CSS for /user/new on validation error

[rails.git] / app / assets / stylesheets / common.css.scss

diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss
index 45e644895f771da87f858bcca8c748ff474b794b..b9306a4f1d99646597e1bb84ad518e2139d09d42 100644 (file)
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -73,6 +73,24 @@ abbr, acronym {
 .col11   { float:left; width:91.6666%; }
 .col12   { width:100%; }
 
+.margin0  { margin-left:04.1666%; }
+.margin1  { margin-left:08.3333%; }
+.margin2  { margin-left:16.6666%; }
+.margin3  { margin-left:25.0000%; }
+.margin4  { margin-left:33.3333%; }
+.margin5  { margin-left:41.6666%; }
+.margin6  { margin-left:50.0000%; }
+.margin7  { margin-left:58.3333%; }
+.margin8  { margin-left:66.6666%; }
+.margin9  { margin-left:75.0000%; }
+.margin10 { margin-left:83.3333%; }
+.margin11 { margin-left:91.6666%; }
+.margin12 { margin-left:100.0000%; }
+
+.pad1 { padding: $lineheight/2; }
+.pad2 { padding: $lineheight; }
+
+.fillL { background-color: white; }
 /* Default rules for the body of every page */
 
 * {
@@ -1014,7 +1032,6 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
 /* Rules for the main content area */
 
 #content {
-  padding: $lineheight;
   position: relative;
 }
 
@@ -1028,19 +1045,52 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
   border-left: 1px solid #ccc;
 }
 
+/* Overrides for pages that use new layout conventions */
+.site-verifysignup,
 .site-copyright,
-.site-welcome,
-.user-new {
+.site-welcome {
+  #content {
+    max-width: 740px;
+  }
+}
+
+.user-new,
+.user-create {
   .content-heading {
-    text-align: center;
+    height: 200px;
   }
 
-  #content {
-    max-width: 700px;
-    margin: auto;
+  #content.pad2 {
+    padding: 0;
   }
 }
 
+.header-illustration { 
+  background-position: 0 0;
+  background-repeat: no-repeat;
+  position: absolute;
+}
+
+.header-illustration.new-user-main {
+  height: 200px;
+  width: 100%;
+  left: 0;
+  bottom: 0;
+  background-image: image-url("sign-up-illustration.png");
+}
+
+.header-illustration.new-user-arm {
+  height: 110px;
+  width: 130px;
+  left: 260px;
+  top: 160px;
+  background-image: image-url("sign-up-illustration-arm.png");
+}
+
+@media only screen and (max-width:770px) {
+  .new-user-illustration.new-user-arm { display: none;}
+}
+
 .wrapper {
   margin-left: 184px;
   border-left: 1px solid #ccc;
@@ -1096,6 +1146,7 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
   position: relative;
   padding: $lineheight;
   background: $offwhite;
+  z-index: 2;
   h1, h2 {
     margin-bottom: $lineheight/2;
     line-height: 100%;
@@ -1454,7 +1505,7 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
   float: left;
 }
 
-/* Rules for the login page */
+/* Rules for the log in page */
 
 #login_openid_buttons {
   margin-bottom: 0;
@@ -1494,9 +1545,9 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
       float: left;
     }
     #decline {
-      background: $grey;
+      background: $lightblue;
       &:hover {
-        background: darken($grey, $hovercolor);
+        background: darken($lightblue, $hovercolor);
       }
     }
   }
@@ -2221,10 +2272,33 @@ a.button {
   background: #fff;
 }
 
+/* Rules for the "Verify signup" page */
+.site-verifysignup .content-heading { 
+  height: 200px;  
+}
+
+.header-illustration.verify-main { 
+  background-position: 0 0;
+  background-repeat: no-repeat;
+  position: absolute;
+}
+
+.header-illustration.verify-main {
+  height: 200px;
+  width: 100%;
+  left: 0;
+  bottom: 0;
+  background-image: image-url("verify-illustration.png");
+}
+
 /* Rules for the "Welcome" page */
 .site-welcome {
   .center {
     text-align: center;
+    .sprite { 
+      float: none;
+      margin: auto;
+    }
   }
 
   .drop {
@@ -2234,9 +2308,19 @@ a.button {
   .sprite {
     background-image: image-url("welcome-sprite.png");
     background-size: 500px 250px;
-    display: inline-block;
+    display: block;
+    float: left;
   }
 
+  .icon-list { 
+    padding-bottom: 20px;
+  div { 
+    margin-bottom: 10px;
+      p {
+        padding-top: 10px;
+      }
+    }
+  }
   .sprite.small {
     width: 50px;
     height: 50px;
@@ -2259,7 +2343,7 @@ a.button {
     background-position: -150px 0;
   }
 
-  .sprite.changeset {
+  .sprite.tag {
     background-position: -200px 0;
   }
 
@@ -2271,22 +2355,10 @@ a.button {
     background-position: -300px 0;
   }
 
-  .pad1 {
-    padding: 10px;
-  }
-
-  .pad2 {
-    padding: 20px;
-  }
-
   .start-mapping {
-    background: #EB6F67;
-    color: #FFF;
     margin: auto;
     cursor: pointer;
     border: none;
-    border-radius: 5px;
-    border-bottom: 1px solid #A53931;
     padding: 20px 40px;
     font-size: 30px;
     text-decoration: none;