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

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

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 53a60a3b2c862bc0c3313f11605651499b5c4370..aa8b9d65b64c62931c2a372fd91c0ab06d11851c 100644 (file)
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -79,7 +79,7 @@ time[title] {
   position: absolute;
   top: 0;
   right: 0;
   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;
   background-size: 30px 30px;
   width: 30px;
   height: 30px;


@@ -457,13 +457,17 @@ body.small-nav {
   border-top: 0px !important;
 }
 
   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;
 }
 
   @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;
 }
 .leaflet-contextmenu-item.over {
   @extend .bg-body-secondary, .border-secondary, .border-opacity-10;
 }


@@ -481,6 +485,14 @@ body.small-nav {
   .mapkey-table-entry td:first-child > * {
     filter: brightness(.8);
   }
   .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 */
 }
 
 /* Rules for attribution text under the main map shown on printouts */


@@ -554,7 +566,7 @@ header .search_forms,
 /* Rules for routing */
 
 div.direction {
 /* 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;
   width: 20px;
   height: 20px;
   background-repeat: no-repeat;


@@ -729,6 +741,10 @@ tr.turn {
   h1 {
     transform: scaleX(-1);
   }
   h1 {
     transform: scaleX(-1);
   }

+
+  ul {
+    transform: scaleX(-1);
+  }

 }
 
 /* Rules for small maps in content areas */
 }
 
 /* Rules for small maps in content areas */


@@ -875,28 +891,20 @@ div.secondary-actions {
   }
 }
 
   }
 }
 

-/* Rules for the "Welcome" page */
+/* Rules for the "Welcome" and "Fix the map" pages */
+

 .site-welcome, .site-fixthemap {
   .sprite {
 .site-welcome, .site-fixthemap {
   .sprite {

-    background-image: image-url("welcome-sprite.png");
-    background-size: 500px 250px;
-    display: block;
-  }
-
-  .sprite.small {

     width: 50px;
     height: 50px;
     width: 50px;
     height: 50px;

+    background-image: image-url("welcome-sprite.svg");
+    background-size: 500px 250px;

   }
 
   .sprite.x {
     /*rtl:ignore*/ background-position: -50px 0;
   }
 
   }
 
   .sprite.x {
     /*rtl:ignore*/ background-position: -50px 0;
   }
 

-  .sprite.term {
-    margin-right: 10px;
-    vertical-align: middle;
-  }
-

   .sprite.node {
     /*rtl:ignore*/ background-position: -100px 0;
   }
   .sprite.node {
     /*rtl:ignore*/ background-position: -100px 0;
   }


@@ -922,6 +930,8 @@ div.secondary-actions {
   }
 }
 
   }
 }
 

+/* Rules for the "About" page */
+

 .site-about #content {
   .content-inner {
     max-width: 760px;
 .site-about #content {
   .content-inner {
     max-width: 760px;