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

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 1dcdb3b2660962d7071129fc7188172e49bc3dcb..c3f2b36adc361a320f7618664c5d39644cb75c36 100644 (file)
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -103,11 +103,11 @@ header {
   }
 
   > * {
-    height: 100%;
     padding: $lineheight * 0.5;
   }
 
   h1 {
+    height: $headerHeight;
     font-size: 18px;
   }
 
@@ -632,11 +632,6 @@ tr.turn {
     }
   }
 
-  .note-description {
-    overflow: hidden;
-    margin: 0 0 10px 10px;
-  }
-
   .query-results {
     display: none;
   }

diff --git a/app/views/notes/show.html.erb b/app/views/notes/show.html.erb
index 79cc46b09353e9b304a80c6c6b4c1aef36d4ca30..b3f1244338dc6ab4b704304caf73036715786194 100644 (file)
--- a/app/views/notes/show.html.erb
+++ b/app/views/notes/show.html.erb
@@ -4,7 +4,7 @@
 
 <div>
   <h4><%= t(".description") %></h4>
-  <div class="note-description">
+  <div class="overflow-hidden ms-2">
     <%= h(@note_comments.first.body.to_html) %>
   </div>
 

diff --git a/yarn.lock b/yarn.lock
index f67c71cea6c3de5f59c024ef1af070738b1e1db4..230c1c716a0c97461471e69eeb10d1faca714896 100644 (file)
--- a/yarn.lock
+++ b/yarn.lock
@@ -512,9 +512,9 @@ keyv@^4.5.4:
     json-buffer "3.0.1"
 
 leaflet.locatecontrol@^0.81.0:
-  version "0.81.0"
-  resolved "https://registry.yarnpkg.com/leaflet.locatecontrol/-/leaflet.locatecontrol-0.81.0.tgz#75e92d07c19edade910a2b5a177ac24cef7d10e7"
-  integrity sha512-5Dqj6VXVFl1vPquYZW95hQYegvzqSI4eLIpZrBMuHuyoAo5i9y6js3z02TF//XXZByIyTI/XBtlxlZLUM08Pcg==
+  version "0.81.1"
+  resolved "https://registry.yarnpkg.com/leaflet.locatecontrol/-/leaflet.locatecontrol-0.81.1.tgz#8aec3124ef5cdda3476fd9013315789b4e301a45"
+  integrity sha512-ZtsdScGufPw330X3UIaGGjnfQ1NrhLySnlruWufIMnfzsHgQPz0+mSxsCQMVh7QgOBoefCGb/lioSejiaNx1EQ==
 
 leaflet@^1.8.0:
   version "1.9.4"
@@ -576,9 +576,9 @@ optionator@^0.9.3:
     type-check "^0.4.0"
 
 osm-community-index@^5.2.0:
-  version "5.6.3"
-  resolved "https://registry.yarnpkg.com/osm-community-index/-/osm-community-index-5.6.3.tgz#8c7621683a2a4c1037ddb14d060b8442a3aa15cb"
-  integrity sha512-UnJBRbaMPIM3J08CA1crKeAok6c1HYiK6tB8AdnjvrvGNnl2JXPxdztA4Jcb3pbrjq/0q14v1mBr300TmtMwbQ==
+  version "5.7.0"
+  resolved "https://registry.yarnpkg.com/osm-community-index/-/osm-community-index-5.7.0.tgz#1c1a785fd13a2e00535da8db132c4e49780f0b28"
+  integrity sha512-r5h58L9mGh2Wu4XcJoGKLdw3oBY41jWAMUVBNE9tBS9sZINwSZccrImhxuOS5DmpslTjZ6w1cn7x9sE8tnFGpQ==
   dependencies:
     diacritics "^1.3.0"