From: Tom Hughes <tom@compton.nu>
Date: Mon, 8 Apr 2024 19:24:48 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/4664'
X-Git-Tag: live~689
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/5dc9fb3dc550a7b81ee6df5d6ca97e050798aba9?hp=-c

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

5dc9fb3dc550a7b81ee6df5d6ca97e050798aba9
diff --combined app/assets/stylesheets/common.scss
index 14aaad9cb,6cbc55d7e..eac3f7417
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@@ -150,6 -150,11 +150,6 @@@ nav.primary 
  nav.secondary {
    .nav-link {
      padding: 0.2rem;
 -    color: $darkgrey;
 -  }
 -
 -  > ul li.current a {
 -    color: darken($darkgrey, 25%);
    }
  
    #inboxanchor {
@@@ -688,16 -693,15 +688,15 @@@ tr.turn:hover 
    .export_boxy {
      background: $lightgrey;
  
-     #maxlat { margin-top: -1px; }
+     > * {
+         margin: -1px;
+     }
      #minlon {
-       float: left;
-       /*rtl:ignore*/ margin-left: -1px;
+       /*rtl:ignore*/ float: left;
      }
      #maxlon {
-       float: right;
-       /*rtl:ignore*/ margin-right: -1px;
+       /*rtl:ignore*/ float: right;
      }
-     #minlat { margin-bottom: -1px; }
    }
  }
  
@@@ -842,6 -846,8 +841,6 @@@
  }
  
  .search_form {
 -  background-color: $lightgrey;
 -
    #query {
      z-index: 0;
    }
@@@ -851,6 -857,10 +850,6 @@@
    }
  }
  
 -.directions_form {
 -  background-color: $lightgrey;
 -}
 -
  /* Rules for user images */
  
  img.user_image {