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

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

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index a1734682e159e2c3040ca67fee5b828c864331cd..4bedf42b6ac2b6571a7b09d27f2bf11973c6d222 100644 (file)
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -70,6 +70,28 @@ time[title] {
   }
 }
 
   }
 }
 

+/* Utility for delayed loading spinner */
+
+.delayed-fade-in {
+  animation: 300ms linear forwards delayed-fade-in;
+}
+
+@keyframes delayed-fade-in {
+  0%   { opacity: 0 }
+  66%  { opacity: 0 }
+  100% { opacity: 1 }
+}
+
+/* Bootstrap close button overrides for nested light/dark themes */
+
+[data-bs-theme="dark"] .btn-close {
+  filter: var(--bs-btn-close-white-filter);
+}
+
+[data-bs-theme="light"] .btn-close {
+  filter: none;
+}
+

 /* Rules for the header */
 
 #menu-icon {
 /* Rules for the header */
 
 #menu-icon {


@@ -119,7 +141,7 @@ header {
 }
 
 nav.primary {
 }
 
 nav.primary {

-  & > .btn-group .btn-outline-primary {
+  #edit_tab .btn-outline-primary {

     @include button-outline-variant($green, $color-hover: $white, $active-color: $white);
   }
 
     @include button-outline-variant($green, $color-hover: $white, $active-color: $white);
   }
 


@@ -197,9 +219,7 @@ body.small-nav {
     }
   }
 
     }
   }
 

-  #sidebar .search_forms,
-  #edit_tab,
-  #export_tab {
+  #sidebar .search_forms {

     display: none;
   }
 
     display: none;
   }
 


@@ -207,7 +227,7 @@ body.small-nav {
     margin-right: 0;
     padding: 0;
 
     margin-right: 0;
     padding: 0;
 

-    .btn-group {
+    #edit_tab {

       width: 100%;
       padding: 10px;
     }
       width: 100%;
       padding: 10px;
     }


@@ -368,6 +388,14 @@ body.small-nav {
     .leaflet-marker-draggable {
       cursor: move;
     }
     .leaflet-marker-draggable {
       cursor: move;
     }

+
+    .query-marker {
+      animation: 1500ms forwards query-marker-fade;
+
+      @keyframes query-marker-fade {
+        to { opacity: 0 }
+      }
+    }

   }
 
   #map-ui {
   }
 
   #map-ui {


@@ -412,9 +440,12 @@ body.small-nav {
 
 .layers-ui {
   .base-layers > * {
 
 .layers-ui {
   .base-layers > * {

-    height: 56px;
+    height: 3.5rem;

 
     > .btn {
 
     > .btn {

+      box-sizing: content-box;
+      top: - map.get($border-widths, 4);
+      left: - map.get($border-widths, 4);

       --bs-btn-border-color: var(--bs-body-bg);
     }
     > .btn:hover {
       --bs-btn-border-color: var(--bs-body-bg);
     }
     > .btn:hover {


@@ -471,17 +502,17 @@ body.small-nav {
 }
 
 @include color-mode(dark) {
 }
 
 @include color-mode(dark) {

-  .leaflet-tile-container,
+  .leaflet-tile-container .leaflet-tile,

   .mapkey-table-entry td:first-child > * {
     filter: brightness(.8);
   }
 
   .mapkey-table-entry td:first-child > * {
     filter: brightness(.8);
   }
 

-  .leaflet-control-attribution a {
+  .leaflet-container .leaflet-control-attribution a {

     color: var(--bs-link-color);
   }
 
   .leaflet-control-scale-line {
     color: var(--bs-link-color);
   }
 
   .leaflet-control-scale-line {

-    @extend .border-light, .border-opacity-75;
+    border-color: rgba(var(--bs-light-rgb), .75) !important;

   }
 }
 
   }
 }
 


@@ -901,6 +932,12 @@ div.secondary-actions {
   }
 }
 
   }
 }
 

+/* Rules for block pages */
+
+#block_list .username {
+  max-width: 20em;
+}
+

 /* Rules for tabs inside secondary background sections */
 
 .bg-body-secondary .nav-tabs {
 /* Rules for tabs inside secondary background sections */
 
 .bg-body-secondary .nav-tabs {


@@ -936,6 +973,10 @@ img.trace_image {
   .node, .way, .relation {
     margin-left: 25px;
   }
   .node, .way, .relation {
     margin-left: 25px;
   }

+
+  .node::before     { content: image-url('browse/node.svg'); }
+  .way::before      { content: image-url('browse/way.svg'); }
+  .relation::before { content: image-url('browse/relation.svg'); }

 }
 
 @each $class, $item in $map-sidebar-icons {
 }
 
 @each $class, $item in $map-sidebar-icons {