X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/c0f5e4ede89c0cb0245bac10ebca044325f018b7..a3e3be007efa55dd80bd056ba0b877f692003918:/app/assets/stylesheets/common.scss

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 7db36b628..5db46be68 100644
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -1,4 +1,5 @@
 @import "parameters";
+@import "bootstrap-custom";
 
 /* Styles common to large and small screens */
 
@@ -108,23 +109,6 @@ body {
   height: 100%;
 }
 
-h1, h2, h3 {
-  font-weight: 600;
-  line-height: 1.2;
-}
-
-h4, h5 {
-  font-weight: 500;
-}
-
-h1 {
-  font-size: 18px;
-}
-
-h2, h3 {
-  font-size: 16px;
-}
-
 p > img {
   width: auto;
   max-width: 100%;
@@ -280,12 +264,19 @@ header {
   }
 
   h1 {
+    font-size: 18px;
+    font-weight: 600;
+    line-height: 1.2;
     margin: 0;
     padding-top: 15px;
 
     a {
       color: #000;
     }
+
+    a:hover {
+      color: #000;
+    }
   }
 }
 
@@ -505,7 +496,7 @@ body.compact {
   }
 
   &.active {
-    background-color: #9ed485;
+    background-color: $vibrant-green;
   }
 
   .icon {
@@ -939,7 +930,7 @@ header .search_forms,
 
   input:focus {
     outline: none;
-    box-shadow: 0px 0px 7px #9ED485;
+    box-shadow: 0px 0px 7px $vibrant-green;
   }
 
   input[type=submit].float {
@@ -1496,7 +1487,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;
 
@@ -1505,10 +1495,6 @@ tr.turn:hover {
     color: gray;
   }
 
-  .trace_pending {
-    color: red;
-  }
-
   .trace_public {
     color: green;
   }
@@ -1529,10 +1515,6 @@ tr.turn:hover {
 /* Rules for the trace view */
 
 .trace-show {
-  .trace_pending {
-    color: red;
-  }
-
   .geo {
     display: inline;
   }
@@ -1651,7 +1633,6 @@ tr.turn:hover {
 /* Rules for the user list */
 
 #user_list {
-  font-size: $lineheight/2;
   width: 100%;
 
   tr {
@@ -2775,7 +2756,7 @@ input.richtext_title[type="text"] {
       font-weight: 300;
       font-size: 34px;
       span {
-        color: #76c551;
+        color: $vibrant-green;
       }
     }
 
@@ -2789,7 +2770,7 @@ input.richtext_title[type="text"] {
       background-repeat: no-repeat;
       background-image: image-url('about/osm.png');
       background-size: cover;
-      background-color: #76c551;
+      background-color: $vibrant-green;
     }
 
     .byosm {
@@ -2803,7 +2784,7 @@ input.richtext_title[type="text"] {
       font: 500 20px/24px Helvetica, Arial, sans-serif;
       white-space: nowrap;
       color: #fff;
-      background: #76c551;
+      background: $vibrant-green;
     }
 
     .byosm span {