From: Tom Hughes <tom@compton.nu>
Date: Sun, 14 Apr 2024 17:48:30 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/4691'
X-Git-Tag: live~177
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/90de7a7b83569210ce5d13596b320453d19d9cea?hp=-c

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

90de7a7b83569210ce5d13596b320453d19d9cea
diff --combined app/assets/stylesheets/common.scss
index 931d10c8a,404933997..3f7c0b48f
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@@ -513,12 -513,6 +513,12 @@@ header .search_forms
    display: none;
  }
  
 +.search_form {
 +  .describe_location {
 +    font-size: 10px;
 +  }
 +}
 +
  /* Rules for search sidebar */
  
  #sidebar .search_results_entry {
@@@ -651,16 -645,9 +651,9 @@@ tr.turn:hover 
  /* Rules for export sidebar */
  
  .export_form {
-   .export_area_inputs,
-   .export_button {
-     text-align: center;
-   }
- 
    .export_area_inputs {
-     margin-bottom: $spacer;
      input[type="text"] {
        width: 100px;
-       text-align: center;
      }
    }
  
@@@ -808,11 -795,21 +801,11 @@@
  /* Rules for messages pages */
  
  .messages {
 -  .inbox-row {
 -    background: $offwhite;
 -  }
 -
    .inbox-row-unread td {
      background: #CBEEA7;
    }
  }
  
 -.search_form {
 -  .describe_location {
 -    font-size: 10px;
 -  }
 -}
 -
  /* Rules for user images */
  
  img.user_image {
@@@ -861,7 -858,8 +854,7 @@@ div.secondary-actions 
  
  /* Rules for rich text */
  
 -.richtext,
 -.prose {
 +.richtext {
    code {
      background: var(--bs-secondary-bg);
      padding: 2px 3px;