Merge remote-tracking branch 'upstream/pull/4829'

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

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 6eafb89d18b3249e6c5b8c80e2f8253223a6ff28..cf0bfae22527b41685c3ef8cd7524fef739673fd 100644 (file)
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -50,7 +50,7 @@ time[title] {
 
 /* Utility for de-emphasizing content */
 
-.text-muted a {
+.text-body-secondary a {
   color: $blue;
 }
 
@@ -79,7 +79,7 @@ time[title] {
   position: absolute;
   top: 0;
   right: 0;
-  background: image-url("menu-icon.png") no-repeat;
+  background: image-url("menu-icon.svg") no-repeat;
   background-size: 30px 30px;
   width: 30px;
   height: 30px;
@@ -103,18 +103,12 @@ header {
   }
 
   > * {
-    height: 100%;
     padding: $lineheight * 0.5;
   }
 
-  img.logo {
-    margin-top: -2px;
-  }
-
   h1 {
+    height: $headerHeight;
     font-size: 18px;
-    line-height: 1.2;
-    padding-top: 15px;
   }
 
   .btn {
@@ -566,7 +560,7 @@ header .search_forms,
 /* Rules for routing */
 
 div.direction {
-  background-image: image-url('routing-sprite.png');
+  background-image: image-url('routing-sprite.svg');
   width: 20px;
   height: 20px;
   background-repeat: no-repeat;
@@ -891,29 +885,20 @@ div.secondary-actions {
   }
 }
 
-/* Rules for the "Welcome" page */
+/* Rules for the "Welcome" and "Fix the map" pages */
+
 .site-welcome, .site-fixthemap {
   .sprite {
-    background-image: image-url("welcome-sprite.svg");
-    background-size: 500px 250px;
-    display: block;
-  }
-
-  .sprite.small {
     width: 50px;
     height: 50px;
+    background-image: image-url("welcome-sprite.svg");
+    background-size: 500px 250px;
   }
 
   .sprite.x {
     /*rtl:ignore*/ background-position: -50px 0;
   }
 
-  .sprite.term {
-    margin-right: 10px;
-    vertical-align: middle;
-    display: inline-block;
-  }
-
   .sprite.node {
     /*rtl:ignore*/ background-position: -100px 0;
   }
@@ -939,6 +924,8 @@ div.secondary-actions {
   }
 }
 
+/* Rules for the "About" page */
+
 .site-about #content {
   .content-inner {
     max-width: 760px;