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

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index cf0bfae22527b41685c3ef8cd7524fef739673fd..8f9e7d018566c8d5453ed683c9daa7f54ae3ce9d 100644 (file)
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -636,11 +636,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>