]> git.openstreetmap.org Git - rails.git/commitdiff
Merge remote-tracking branch 'upstream/pull/4697'
authorTom Hughes <tom@compton.nu>
Sun, 14 Apr 2024 17:41:05 +0000 (18:41 +0100)
committerTom Hughes <tom@compton.nu>
Sun, 14 Apr 2024 17:41:05 +0000 (18:41 +0100)
app/assets/stylesheets/common.scss
app/assets/stylesheets/parameters.scss
yarn.lock

index 629d26a814be9bf633c582fbdd8dec12c99d47b4..67813e1788029c06cf1c9deab81424d1e76717c0 100644 (file)
@@ -802,10 +802,6 @@ tr.turn:hover {
 /* Rules for messages pages */
 
 .messages {
-  .inbox-row {
-    background: $offwhite;
-  }
-
   .inbox-row-unread td {
     background: #CBEEA7;
   }
@@ -865,8 +861,7 @@ div.secondary-actions {
 
 /* Rules for rich text */
 
-.richtext,
-.prose {
+.richtext {
   code {
     background: var(--bs-secondary-bg);
     padding: 2px 3px;
index e6c15a92014f8afc10fd25b7e61a2b202ee39dd7..3d66db5fbe65cb013289a6b61d6d60978794386f 100644 (file)
@@ -2,7 +2,6 @@
 $lineheight: 20px;
 $typeheight: 14px;
 
-$offwhite: #f8f8ff;
 $blue: #7092FF;
 $secondary: #888;
 $lightblue: #B8C5F0;
index 1493b7305e384f96ea71d895c6bbb2f0ba736c10..487e5554212d2e9d1e58bf814b9d068b382fcf6b 100644 (file)
--- a/yarn.lock
+++ b/yarn.lock
@@ -629,9 +629,9 @@ punycode@^2.1.0:
   integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
 
 qs@^6.9.4:
-  version "6.12.0"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.12.0.tgz#edd40c3b823995946a8a0b1f208669c7a200db77"
-  integrity sha512-trVZiI6RMOkO476zLGaBIzszOdFPnCCXHPG9kn0yuS1uz6xdVxPfZdB3vUig9pxPFDM9BRAgz/YUIVQ1/vuiUg==
+  version "6.12.1"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.12.1.tgz#39422111ca7cbdb70425541cba20c7d7b216599a"
+  integrity sha512-zWmv4RSuB9r2mYQw3zxQuHWeU+42aKi1wWig/j4ele4ygELZ7PEO6MM7rim9oAQH2A5MWfsAVf/jPvTPgCbvUQ==
   dependencies:
     side-channel "^1.0.6"