Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/pull/4833'
Browse files Browse the repository at this point in the history
  • Loading branch information
tomhughes committed May 25, 2024
2 parents 34ca352 + cd30c56 commit a15f4ed
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 6 deletions.
5 changes: 0 additions & 5 deletions app/assets/stylesheets/common.scss
Original file line number Diff line number Diff line change
Expand Up @@ -636,11 +636,6 @@ tr.turn {
}
}

.note-description {
overflow: hidden;
margin: 0 0 10px 10px;
}

.query-results {
display: none;
}
Expand Down
2 changes: 1 addition & 1 deletion app/views/notes/show.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down

0 comments on commit a15f4ed

Please sign in to comment.