Use bootstrap grid for signup page

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

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 59f81353dcf156a612597462e63ab4b5d69c9f80..197e678a20942140ea4701d2096eb626ba5f59e0 100644 (file)
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -541,6 +541,7 @@ body.compact {
   #sidebar {
     float: left;
     width: $sidebarWidth;
+    background: #fff;
 
     #sidebar_loader {
       display: none;
@@ -1403,19 +1404,6 @@ tr.turn:hover {
 
 /* Overrides for pages that use new layout conventions */
 
-.users-new,
-.users-create,
-.users-terms {
-  .content-body .content-inner {
-    padding: 0;
-
-    .message {
-      margin-top: 80px;
-      padding: 20px;
-    }
-  }
-}
-
 .users-new,
 .users-create,
 .users-terms,
@@ -1483,7 +1471,6 @@ tr.turn:hover {
 /* Rules for the trace list shown by the traces tab etc */
 
 #trace_list {
-  font-size: $lineheight/2;
   border-width: 0px;
   text-align: right;
 
@@ -1491,38 +1478,6 @@ tr.turn:hover {
     font-size: 12px;
     color: gray;
   }
-
-  .trace_pending {
-    color: red;
-  }
-
-  .trace_public {
-    color: green;
-  }
-
-  .trace_identifiable {
-    color: green;
-  }
-
-  .trace_trackable {
-    color: red;
-  }
-
-  .trace_private {
-    color: red;
-  }
-}
-
-/* Rules for the trace view */
-
-.trace-show {
-  .trace_pending {
-    color: red;
-  }
-
-  .geo {
-    display: inline;
-  }
 }
 
 /* Rules for the new trace form */
@@ -1638,7 +1593,6 @@ tr.turn:hover {
 /* Rules for the user list */
 
 #user_list {
-  font-size: $lineheight/2;
   width: 100%;
 
   tr {
@@ -2078,6 +2032,7 @@ textarea {
   color: #222;
   background-color: #fff;
   border: 1px solid $grey;
+  border-radius: 3px;
   padding: 2px 5px;
   margin: 0;
   width: 200px;
@@ -2090,6 +2045,8 @@ textarea {
 textarea {
   padding: 5px;
   width: 100%;
+  min-height: 50px;
+  resize: vertical;
 }
 
 /* Rules for user images */
@@ -2300,12 +2257,6 @@ a.button {
 
 .richtext,
 .prose {
-  h1, h2 {
-    padding-bottom: $lineheight/2;
-    border-bottom: 1px dashed $grey;
-    margin-bottom: $lineheight/2;
-  }
-
   code {
     font-size: 13px;
     background: $lightgrey;
@@ -2663,11 +2614,6 @@ input.richtext_title[type="text"] {
     text-decoration: none;
   }
 
-  .note-box {
-    margin-top: 20px;
-    background-color: $offwhite;
-  }
-
   .icon.note {
     background-color: #333;
     border-radius: 4px;
@@ -2873,12 +2819,6 @@ input.richtext_title[type="text"] {
 }
 
 .report-disclaimer {
-  background: #fff1f0;
-  color: #d85030;
-  border-color: rgba(216, 80, 48, 0.3);
-  padding: 10px 20px;
-  margin-bottom: $lineheight;
-
   ul {
     padding-left: $lineheight;
     margin-bottom: 0;