Use Bootstrap .nav in secondary header navigation

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

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 8a5aa142cc6de9506430166912fae3ee36a30487..4ee7b860c2b583bb28d24b7b18fa2b5cbb8d08c5 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;
@@ -98,23 +98,13 @@ header {
   position: relative;
   font-size: 14px;
 
-  h1, nav, nav > ul, nav > ul > li {
-    display: inline-block;
-  }
-
   > * {
-    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 {
@@ -197,7 +187,7 @@ body.small-nav {
     min-height: $headerHeight;
 
     &.closed nav {
-      display: none;
+      display: none !important;
     }
 
     .search_forms {
@@ -222,6 +212,8 @@ body.small-nav {
   }
 
   nav.secondary {
+    flex-direction: column;
+
     .user-menu, .login-menu {
       width: 100%;
     }
@@ -429,10 +421,6 @@ body.small-nav {
   }
 
   .overlay-layers {
-    p {
-      font-size: 13px;
-      margin-bottom: 8px;
-    }
     li.disabled { color: $darkgrey; }
   }
 }
@@ -457,13 +445,17 @@ body.small-nav {
   border-top: 0px !important;
 }
 
-.leaflet-popup-content-wrapper,
-.leaflet-popup-tip,
-.leaflet-contextmenu,
-.leaflet-contextmenu-item {
+.leaflet-popup-content-wrapper, .leaflet-popup-tip,
+.leaflet-contextmenu, .leaflet-contextmenu-item,
+.leaflet-control-attribution, .leaflet-control-scale-line {
   @extend .bg-body, .text-body;
 }
 
+.leaflet-control-attribution, .leaflet-control-scale-line {
+  @extend .bg-opacity-75;
+  text-shadow: none !important;
+}
+
 .leaflet-contextmenu-item.over {
   @extend .bg-body-secondary, .border-secondary, .border-opacity-10;
 }
@@ -476,6 +468,21 @@ body.small-nav {
   }
 }
 
+@include color-mode(dark) {
+  .leaflet-tile-container,
+  .mapkey-table-entry td:first-child > * {
+    filter: brightness(.8);
+  }
+
+  .leaflet-control-attribution a {
+    color: var(--bs-link-color);
+  }
+
+  .leaflet-control-scale-line {
+    @extend .border-light, .border-opacity-75;
+  }
+}
+
 /* Rules for attribution text under the main map shown on printouts */
 
 .donate-attr { color: darken($green, 10%) !important; }
@@ -547,7 +554,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;
@@ -623,11 +630,6 @@ tr.turn {
     }
   }
 
-  .note-description {
-    overflow: hidden;
-    margin: 0 0 10px 10px;
-  }
-
   .query-results {
     display: none;
   }
@@ -704,6 +706,7 @@ tr.turn {
 
   &.new-user-main {
     background-image: image-url("sign-up-illustration.png");
+    background-position-x: 50px;
   }
 
   &.confirm-main {
@@ -713,17 +716,6 @@ tr.turn {
   &.new-user-terms {
     background-image: image-url("terms-illustration.png");
   }
-
-  &.new-user-arm {
-    height: 110px;
-    width: 130px;
-    left: 280px;
-    top: 180px;
-    background-image: image-url("sign-up-illustration-arm.png");
-    position: absolute;
-    z-index: 100;
-    pointer-events: none;
-  }
 }
 
 [dir=rtl] .header-illustration {
@@ -732,6 +724,10 @@ tr.turn {
   h1 {
     transform: scaleX(-1);
   }
+
+  ul {
+    transform: scaleX(-1);
+  }
 }
 
 /* Rules for small maps in content areas */
@@ -878,28 +874,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.png");
-    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;
-  }
-
   .sprite.node {
     /*rtl:ignore*/ background-position: -100px 0;
   }
@@ -925,6 +913,8 @@ div.secondary-actions {
   }
 }
 
+/* Rules for the "About" page */
+
 .site-about #content {
   .content-inner {
     max-width: 760px;
@@ -991,6 +981,10 @@ div.secondary-actions {
   }
 }
 
+.auth-container {
+  max-width: 600px;
+}
+
 /* Rules for tabs inside secondary background sections */
 
 .bg-body-secondary .nav-tabs {
@@ -1032,4 +1026,12 @@ img.trace_image {
   .browse-section #{$class}::before {
     content: image-url('browse/#{map.get($item, "filename")}');
   }
+
+  @if map.get($item, "invert") {
+    @include color-mode(dark) {
+      .browse-section #{$class}::before {
+        filter: invert(.8) hue-rotate(180deg);
+      }
+    }
+  }
 }