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 db81669d127d895bf1d805e597ef79b9edbf4840..6eecae577ec219cf01caff364ded192217d732bc 100644 (file)
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -1046,16 +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 */

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

 .site-copyright,
 .site-copyright,

-.site-welcome,
-.user-new {
-  #content.pad2 {
+.site-welcome {
+  #content {
+    max-width: 740px;
+  }
+}
+
+.user-new,
+.user-create,
+.user-terms,
+.user-confirm {
+  .content-heading {
+    height: 200px;
+  }
+}
+
+.user-new,
+.user-create,
+.user-terms {
+  #content {

     padding: 0;
   }
 }
 
     padding: 0;
   }
 }
 

-.user-new .content-heading {
-  height: 200px;  
+.header-illustration {
+  background-position: 0 0;
+  background-repeat: no-repeat;
+  position: absolute;
+  height: 200px;
+  width: 100%;
+  left: 0;
+  bottom: 0;
+
+  &.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) {
+  .header-illustration.new-user-arm { display: none;}

 }
 
 .wrapper {
 }
 
 .wrapper {


@@ -1113,6 +1159,7 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
   position: relative;
   padding: $lineheight;
   background: $offwhite;
   position: relative;
   padding: $lineheight;
   background: $offwhite;

+  z-index: 2;

   h1, h2 {
     margin-bottom: $lineheight/2;
     line-height: 100%;
   h1, h2 {
     margin-bottom: $lineheight/2;
     line-height: 100%;


@@ -1484,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;


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

-  form.sign {
-    input[type=submit] {
-      float: left;
-    }
-    #decline {
-      background: $grey;
-      &:hover {
-        background: darken($grey, $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 */


@@ -1678,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 */


@@ -2242,6 +2283,10 @@ a.button {
 .site-welcome {
   .center {
     text-align: center;
 .site-welcome {
   .center {
     text-align: center;

+    .sprite { 
+      float: none;
+      margin: auto;
+    }

   }
 
   .drop {
   }
 
   .drop {


@@ -2251,9 +2296,19 @@ a.button {
   .sprite {
     background-image: image-url("welcome-sprite.png");
     background-size: 500px 250px;
   .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;
   .sprite.small {
     width: 50px;
     height: 50px;


@@ -2276,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;
   }
 


@@ -2289,13 +2344,9 @@ a.button {
   }
 
   .start-mapping {
   }
 
   .start-mapping {

-    background: #EB6F67;
-    color: #FFF;

     margin: auto;
     cursor: pointer;
     border: none;
     margin: auto;
     cursor: pointer;
     border: none;

-    border-radius: 5px;
-    border-bottom: 1px solid #A53931;

     padding: 20px 40px;
     font-size: 30px;
     text-decoration: none;
     padding: 20px 40px;
     font-size: 30px;
     text-decoration: none;