From: Tom Hughes <tom@compton.nu>
Date: Sat, 27 Apr 2024 14:15:24 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/4724'
X-Git-Tag: live~580
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/7154ebbb540fc8c93da45e58b6885b642737d605?ds=sidebyside;hp=-c

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

7154ebbb540fc8c93da45e58b6885b642737d605
diff --combined app/assets/stylesheets/common.scss
index d4bc31255,150050615..ca9a820f9
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@@ -15,6 -15,10 +15,6 @@@ p > img 
    max-width: 100%;
  }
  
 -small, aside {
 -  font-size: 12px;
 -}
 -
  time[title] {
    text-decoration: underline dotted;
  }
@@@ -545,10 -549,6 +545,6 @@@ header .search_forms
  /* Rules for search sidebar */
  
  #sidebar .search_results_entry {
-   ul li.selected {
-     background: $list-highlight;
-   }
- 
    .search_more .loader {
      display: none;
    }
diff --combined app/assets/stylesheets/parameters.scss
index 97514d5ca,cc1d55ecc..07549d69b
--- a/app/assets/stylesheets/parameters.scss
+++ b/app/assets/stylesheets/parameters.scss
@@@ -4,13 -4,14 +4,12 @@@ $typeheight: 14px
  
  $blue: #7092FF;
  $secondary: #888;
 -$lightblue: #B8C5F0;
  $green: #7ebc6f;
  $vibrant-green: #76c551;
  $grey: #CCC;
 -$lightgrey: #EEE;
  $darkgrey: #888;
  $headerHeight: 55px;
  $sidebarWidth: 350px;
- $list-highlight: #FFFFC0;
  
  $link-color: #24d;
  $link-hover-color: #24d;