Use new design on terms page

[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 78126bb8878691a7428e0b2ce7e2cc274c65df37..6eecae577ec219cf01caff364ded192217d732bc 100644 (file)
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -1046,45 +1046,62 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
 }
 
 /* Overrides for pages that use new layout conventions */
 }
 
 /* Overrides for pages that use new layout conventions */

-.site-verifysignup,
+.user-new,
+.user-create,
+.user-terms,
+.user-confirm,

 .site-copyright,
 .site-welcome {
   #content {
     max-width: 740px;
   }
 }
 .site-copyright,
 .site-welcome {
   #content {
     max-width: 740px;
   }
 }

-.user-new #content.pad2 {
-    padding: 0;
+
+.user-new,
+.user-create,
+.user-terms,
+.user-confirm {
+  .content-heading {
+    height: 200px;

   }
   }

+}

 
 

-.user-new .content-heading {
-  height: 200px;  
+.user-new,
+.user-create,
+.user-terms {
+  #content {
+    padding: 0;
+  }

 }
 
 }
 

-.header-illustration { 
+.header-illustration {

   background-position: 0 0;
   background-repeat: no-repeat;
   position: absolute;
   background-position: 0 0;
   background-repeat: no-repeat;
   position: absolute;

-}
-
-.header-illustration.new-user-main {

   height: 200px;
   width: 100%;
   left: 0;
   bottom: 0;
   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");
+  &.new-user-main {
+    background-image: image-url("sign-up-illustration.png");
+  }
+
+  &.confirm-main {
+    background-image: image-url("confirm-illustration.png");
+  }
+
+  &.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) {
 }
 
 @media only screen and (max-width:770px) {

-  .new-user-illustration.new-user-arm { display: none;}
+  .header-illustration.new-user-arm { display: none;}

 }
 
 .wrapper {
 }
 
 .wrapper {


@@ -1514,7 +1531,7 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
 
 /* Rules for the account confirmation page */
 
 
 /* Rules for the account confirmation page */
 

-#terms {
+.user-terms {

   .legale {
     border: 1px solid #ccc;
     padding: $lineheight;
   .legale {
     border: 1px solid #ccc;
     padding: $lineheight;


@@ -1536,28 +1553,12 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
     }
   }
 
     }
   }
 

-  form.sign {
-    input[type=submit] {
-      float: left;
-    }
-    #decline {
-      background: $lightblue;
-      &:hover {
-        background: darken($lightblue, $hovercolor);
-      }
+  #decline {
+    background: $lightblue;
+    &:hover {
+      background: darken($lightblue, $hovercolor);

     }
   }
     }
   }

-  fieldset {
-    margin-bottom: $lineheight;
-  }
-  #contributorGuidance {
-    background-color: $offwhite;
-    border-radius: 4px;
-    -moz-border-radius: 4px;
-  }
-  .signing-buttons {
-    height: 50px;
-  }

 }
 
 /* Rules for the account settings page */
 }
 
 /* Rules for the account settings page */


@@ -1708,7 +1709,17 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
 .field_with_errors {
   padding: 2px;
   background-color: #ff7070;
 .field_with_errors {
   padding: 2px;
   background-color: #ff7070;

-  display: table;
+  display: inline-block;
+}
+
+.formError {
+  display: inline-block;
+  padding: 5px 10px;
+  margin-top: 5px;
+  border-radius: 4px;
+  font-size: 12px;
+  color: #fff;
+  background-color: #ff7070;

 }
 
 /* Rules for rails validation error boxes */
 }
 
 /* Rules for rails validation error boxes */


@@ -2268,25 +2279,6 @@ a.button {
   background: #fff;
 }
 
   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 {
 /* Rules for the "Welcome" page */
 .site-welcome {
   .center {


@@ -2339,7 +2331,7 @@ a.button {
     background-position: -150px 0;
   }
 
     background-position: -150px 0;
   }
 

-  .sprite.changeset {
+  .sprite.tag {

     background-position: -200px 0;
   }
 
     background-position: -200px 0;
   }