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

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

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index a536f527f297520ca97c77b002a2186317805ab8..2cfd5eba732348b338be53952e627319efc59f5c 100644 (file)
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -170,7 +170,11 @@ nav.primary {
 
 nav.secondary {
   .nav-link {
-    padding: 0.3rem;
+    padding: 0 0.3rem;
+  }
+
+  > ul {
+    height: 1.5em;
   }
 }
 
@@ -228,7 +232,8 @@ body.small-nav {
     flex-direction: column;
 
     > ul {
-      justify-content: unset !important;
+      height: auto;
+      justify-content: center;
     }
 
     .user-menu, .login-menu {
@@ -331,10 +336,6 @@ body.small-nav {
   #sidebar {
     float: left;
     width: $sidebarWidth;
-
-    #sidebar_loader {
-      display: none;
-    }
   }
 
   .overlay-sidebar #sidebar {
@@ -350,6 +351,8 @@ body.small-nav {
       display: block;
     }
 
+    .sidebar-close-controls,
+    #sidebar_loader,
     #sidebar_content {
       display: none;
     }
@@ -577,32 +580,8 @@ header .search_forms,
   }
 }
 
-/* Rules for search sidebar */
-
-#sidebar .search_results_entry {
-  .search_more .loader {
-    display: none;
-  }
-}
-
 /* Rules for routing */
 
-div.direction {
-  background-image: image-url('routing-sprite.svg');
-  width: 20px;
-  height: 20px;
-  background-repeat: no-repeat;
-}
-@for $i from 0 through 25 {
-div.direction.i#{$i} { background-position: #{($i)*-20}px 0px; }
-}
-
-@include color-mode(dark) {
-  div.direction {
-    filter: invert(1);
-  }
-}
-
 td.distance {
     font-size: x-small;
 }
@@ -611,6 +590,8 @@ tr.turn {
 }
 
 .routing_marker_column {
+  margin-left: .35rem;
+  margin-right: .35rem;
   width: 15px;
 
   img {
@@ -631,11 +612,6 @@ tr.turn {
       z-index: 2; /* needs to be higher than Bootstrap's stretched link ::after z-index */
     }
   }
-
-  .changeset_more .loader {
-    display: none;
-    width: 100%;
-  }
 }
 
 /* Rules for the browse sidebar */
@@ -690,12 +666,6 @@ tr.turn {
     > * {
         margin: -1px;
     }
-    #minlon {
-      /*rtl:ignore*/ float: left;
-    }
-    #maxlon {
-      /*rtl:ignore*/ float: right;
-    }
   }
 }
 
@@ -713,9 +683,7 @@ tr.turn {
 /* Rules for non-map content pages */
 
 .content-inner {
-  position: relative;
   max-width: 960px;
-  margin: auto;
   padding: $lineheight;
 }
 
@@ -1002,3 +970,7 @@ img.trace_image {
     }
   }
 }
+
+.heatmap-wrapper {
+  height: 130px;
+}