From: Tom Hughes <tom@compton.nu>
Date: Tue, 14 Nov 2023 17:19:54 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/4297'
X-Git-Tag: live~438
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/1ce5d7dec1503416ab10d17ec2d27ef7e0ab86e9?hp=-c

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

1ce5d7dec1503416ab10d17ec2d27ef7e0ab86e9
diff --combined app/assets/stylesheets/common.scss
index 1a3e9daca,3ab3b6511..5d7c61db3
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@@ -318,6 -318,14 +318,6 @@@ body.small-nav 
    font-weight: $font-weight-normal;
  }
  
 -/* Rules for the message shown in place of the map when javascript is disabled */
 -
 -#noscript {
 -  z-index: 20000000;
 -  margin-left: 400px;
 -  margin-top: 50px;
 -}
 -
  /* Rules for Leaflet maps */
  
  .leaflet-top.leaflet-right,
@@@ -393,6 -401,14 +393,6 @@@
      #sidebar_loader {
        display: none;
      }
 -
 -    #sidebar_content {
 -      padding: $spacer;
 -    }
 -
 -    > div {
 -      position: relative;
 -    }
    }
  
    .overlay-sidebar #sidebar {
@@@ -416,6 -432,11 +416,6 @@@
  
    .welcome {
      display: none;
 -
 -    p {
 -      font-size: 110%;
 -      font-weight: 300;
 -    }
    }
  
    #banner {
@@@ -425,6 -446,11 +425,6 @@@
        display: block;
        width: $sidebarWidth;
      }
 -
 -    button.btn-close {
 -      background-color: rgba(255, 255, 255, 0.5);
 -      opacity: 1.0;
 -    }
    }
  
    #map {
@@@ -577,6 -603,10 +577,6 @@@
      margin-left: auto;
      margin-right: auto;
    }
 -
 -  > div {
 -   padding: $spacer;
 -  }
  }
  
  /* Temporary label size override until we remove site-wide font customisation */
@@@ -706,45 -736,16 +706,16 @@@ tr.turn:hover 
    }
  
    .browse-tag-list {
-     background-color: $offwhite;
      table-layout: fixed;
-     border-collapse: separate;
-     border-spacing: 0;
-     width: 100%;
-     margin-bottom: $spacer;
- 
-     th, td {
-       border-bottom: 1px solid $grey;
-     }
+     white-space: pre-wrap;
  
      tr:last-child th, tr:last-child td {
        border-bottom: 0;
      }
  
-     .browse-tag-k,
-     .browse-tag-v {
-       width: 50%;
-       padding: 6px 10px;
-       word-wrap: break-word;
-       white-space: pre-wrap;
-     }
- 
-     .browse-tag-k {
-       font-weight: 500;
-       background-color: $offwhite;
-     }
- 
-     .browse-tag-v {
-       border-left: 1px solid $grey;
-       background-color: #fff;
-     }
- 
      .colour-preview-box {
-       float: right;
        width: 14px;
        height: 14px;
-       margin: 4px 0px;
-       border: 1px solid rgba(0, 0, 0, .1);
        // add color via inline css on element: background-color: <tag value>;
      }
    }
@@@ -827,6 -828,11 +798,6 @@@
      bottom: 0;
      width: 100%;
    }
 -
 -  #map {
 -    height: 100%;
 -    overflow: hidden;
 -  }
  }
  
  /* Rules for non-map content pages */
@@@ -885,6 -891,15 +856,6 @@@
    }
  }
  
 -#content.maximised {
 -  top: 0;
 -  left: 0;
 -  right: 0;
 -  bottom: 0;
 -  border: 0;
 -  z-index: 2000;
 -}
 -
  /* Rules for small maps in content areas */
  
  .content_map {
@@@ -1063,6 -1078,13 +1034,6 @@@ div.secondary-actions 
    }
  }
  
 -/* Rules for the iD editor */
 -
 -.id-embed {
 -  width: 100%;
 -  height: 100%;
 -}
 -
  /* Rules for the "Welcome" page */
  .site-welcome, .site-fixthemap {
    .sprite {