Fix note icon CSS

[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 d4afea41086f9b6dca69cb334854b951bf297e74..d1983fb8aa1996e52d6bffc04666d540a556de0b 100644 (file)
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -87,9 +87,6 @@ abbr, acronym {
 .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 */
 
@@ -1033,6 +1030,7 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
 
 #content {
   position: relative;
+  padding: $lineheight;
 }
 
 .site-edit #content,
@@ -1046,6 +1044,9 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
 }
 
 /* Overrides for pages that use new layout conventions */
+.user-new,
+.user-create,
+.user-terms,
 .user-confirm,
 .site-copyright,
 .site-welcome {
@@ -1056,6 +1057,7 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
 
 .user-new,
 .user-create,
+.user-terms,
 .user-confirm {
   .content-heading {
     height: 200px;
@@ -1063,7 +1065,8 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
 }
 
 .user-new,
-.user-create {
+.user-create,
+.user-terms {
   #content {
     padding: 0;
   }
@@ -1086,6 +1089,10 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
     background-image: image-url("confirm-illustration.png");
   }
 
+  &.new-user-terms {
+    background-image: image-url("terms-illustration.png");
+  }
+
   &.new-user-arm {
     height: 110px;
     width: 130px;
@@ -1526,7 +1533,7 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
 
 /* Rules for the account confirmation page */
 
-#terms {
+.user-terms {
   .legale {
     border: 1px solid #ccc;
     padding: $lineheight;
@@ -1548,28 +1555,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 */
@@ -1797,6 +1788,10 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
     padding-top: $lineheight;
     border-top: 1px solid $lightgrey;
   }
+  .horizontal-list .form-row { 
+    float: left;
+    padding-right: 10px;
+  }
   .form-row {
     margin-bottom: $lineheight/2;
   }
@@ -1916,6 +1911,8 @@ ul.secondary-actions {
 
 .inner11 { padding: $lineheight/2;}
 
+.inner20 { padding: $lineheight 0;}
+
 .inner02 { padding: 0 $lineheight;}
 
 /* Utility for general button styles */
@@ -2300,10 +2297,6 @@ a.button {
     }
   }
 
-  .drop {
-    margin-top: 20px;
-  }
-
   .sprite {
     background-image: image-url("welcome-sprite.png");
     background-size: 500px 250px;
@@ -2313,8 +2306,8 @@ a.button {
 
   .icon-list { 
     padding-bottom: 20px;
-  div { 
-    margin-bottom: 10px;
+    div {
+      margin-bottom: 10px;
       p {
         padding-top: 10px;
       }
@@ -2364,6 +2357,12 @@ a.button {
   }
 
   .note-box {
+    margin-top: 20px;
     background-color: $offwhite;
   }
+
+  .icon.note {
+    background-color: #333;
+    border-radius: 4px;
+  }
 }