maverick/docbrown
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Comment muting tweaks (#1646)

Browse source
This commit is contained in:
Ben Halpern 2019-01-24 18:16:13 -05:00 • committed by GitHub
parent c4677071a7
commit 5b77b779a3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/assets/javascripts/utilities/buildCommentHTML.js.erb
View file

@ -45,13 +45,16 @@ function buildCommentHTML(comment) {
<a href="'+comment.url+'">'+comment.readable_publish_date+'</a>\
</div>\
<button class="dropbtn">\
<%= image_tag("chevron-down.svg", class: "dropdown-icon") %>\
<%= image_tag("three-dots.svg", class: "dropdown-icon") %>\
</button>\
<div class="dropdown">\
<div class="dropdown-content">\
<a href="'+comment.url+'">\
Permalink\
</a>\
<a href="'+comment.url+'/settings">\
Settings\
</a>\
<a href="/report-abuse?url=https://dev.to'+comment.url+'">Report Abuse</a>\
</div>\
</div>\

13
app/views/comments/settings.html.erb
View file

@ -1,6 +1,6 @@
<style>
.pill{
padding:4px 20px;
padding:8px 20px;
border-radius:100px;
color:white;
margin-right:5px;
@ -20,13 +20,20 @@
}
.container{
text-align: center;
padding: 30px 0px;
}
@media screen and (min-width: 880px) {
.container {
margin-top: 100px;
}
}
</style>
<div class="container">
<h2>Settings for: <a href="<%= @comment.path %>"><%= @comment.title %></a></h2>
<h1>Comment Settings</h1>
<% if @comment.receive_notifications %>
<p>This will mute all notifications for this comment and any of your comments in the thread.</p>
<h4>Don't want notifications for this thread?</h4>
<p><em>This will mute all notifications for this comment and any of your comments in this chain.</em></p>
<% else %>
<p>All notifications for this comment and any of your comments in the thread are currently muted.</p>
<% end %>

5
app/views/layouts/_styles.html.erb
View file

@ -1,4 +1,4 @@
<% cache "base_inline_styles_#{@story_show.to_s}_#{@article_index.to_s}_#{@home_page.to_s}_#{@article_show.to_s}_#{view_class.to_s}_#{@notifications_index}_#{core_pages?.to_s}_#{@tags_index}_#{ApplicationConfig["DEPLOYMENT_SIGNATURE"].to_s}x_xs__", :expires_in => 6.hours do %>
<% cache "base_inline_styles_#{@story_show.to_s}_#{@article_index.to_s}_#{@home_page.to_s}_#{@article_show.to_s}_#{view_class.to_s}_#{@notifications_index}_#{core_pages?.to_s}_#{@tags_index}_#{ApplicationConfig["DEPLOYMENT_SIGNATURE"].to_s}x_xs__", :expires_in => 8.hours do %>
<% if @story_show %>
<style>
<% Rails.application.config.assets.compile = true %>
@ -54,6 +54,9 @@
<%= Rails.application.assets['footer.css'].to_s.html_safe %>
<%= Rails.application.assets["ltags/LiquidTags.scss"].to_s.html_safe %>
<%= Rails.application.assets["syntax.css"].to_s.html_safe %>
<% if view_class.include? "comments-settings" %>
<%= Rails.application.assets['article-show.css'].to_s.html_safe %>
<% end %>
</style>
<% elsif view_class.include? "registrations"%>
<style>