cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update diary comments styling

Browse source
This commit is contained in:
Anton Khorev 2023-08-08 18:29:05 +03:00
parent 98f1e2a21d
commit 9d95d548e8
3 changed files with 3 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

11
app/assets/stylesheets/common.scss
View file

@ -1060,23 +1060,12 @@ tr.turn:hover {
} }
.diary-comment { .diary-comment {
border-top: 1px dashed $grey; border-top: 1px dashed $grey;
padding-top: $lineheight/2;
padding-bottom: $lineheight/2;
&:first-child { &:first-child {
margin-top: $lineheight/2;
padding-top: $lineheight;
border-top: 1px solid $grey; border-top: 1px solid $grey;
} }
&.deleted {
background-color: #fee;
}
p { p {
margin-bottom: $lineheight/2; margin-bottom: $lineheight/2;
} }
.comment-heading {
margin-bottom: 0;
margin-top: 0;
}
} }
} }

4
app/views/diary_entries/_diary_comment.html.erb
View file

@ -1,9 +1,9 @@
<div class="row diary-comment<%= " text-muted deleted" unless diary_comment.visible? %>"> <div class="row diary-comment py-3<%= " text-muted bg-danger bg-opacity-10" unless diary_comment.visible? %>">
<div class="col-auto"> <div class="col-auto">
<%= user_thumbnail diary_comment.user %> <%= user_thumbnail diary_comment.user %>
</div> </div>
<div class="col"> <div class="col">
<p class="text-muted comment-heading" id="comment<%= diary_comment.id %>"><%= t(".comment_from_html", :link_user => (link_to diary_comment.user.display_name, user_path(diary_comment.user)), :comment_created_at => link_to(l(diary_comment.created_at, :format => :friendly), :anchor => "comment#{diary_comment.id}")) %> <p class="text-muted m-0" id="comment<%= diary_comment.id %>"><%= t(".comment_from_html", :link_user => (link_to diary_comment.user.display_name, user_path(diary_comment.user)), :comment_created_at => link_to(l(diary_comment.created_at, :format => :friendly), :anchor => "comment#{diary_comment.id}")) %>
<% if current_user and diary_comment.user.id != current_user.id %> <% if current_user and diary_comment.user.id != current_user.id %>
| <%= report_link(t(".report"), diary_comment) %> | <%= report_link(t(".report"), diary_comment) %>
<% end %> <% end %>

2
app/views/diary_entries/show.html.erb
View file

@ -13,7 +13,7 @@
<%= render @entry %> <%= render @entry %>
<a id="comments"></a> <a id="comments"></a>
<div class='comments'> <div class='comments mt-2'>
<%= render :partial => "diary_comment", :collection => @comments %> <%= render :partial => "diary_comment", :collection => @comments %>
</div> </div>