Merge pull request #1063 from MoshiKoi/issue-1021

codidact · Jun 9, 2023 · d7823c8 · d7823c8
2 parents dbc113f + 88a16f5
commit d7823c8
Showing 1 changed file with 15 additions and 13 deletions.
diff --git a/app/views/posts/_expanded.html.erb b/app/views/posts/_expanded.html.erb
@@ -456,19 +456,22 @@
             <%= pluralize(public_count, 'comment thread') %>
           </h4>
           <% if user_signed_in? %>
-            <p class="has-font-size-caption">
-              <% if CommentThread.post_followed?(post, current_user) %>
-                <%= link_to follow_post_comments_path(post_id: post.id), method: :post,
-                            title: 'Don\'t follow new comment threads on this post' do %>
-                  <i class="fas fa-fw fa-minus"></i> unfollow new
-                <% end %>
-              <% else %>
-                <%= link_to follow_post_comments_path(post_id: post.id), method: :post,
-                            title: 'Follow all new comment threads on this post' do %>
-                  <i class="fas fa-fw fa-plus"></i> follow new
-                <% end %>
+            <a class="button is-outlined is-small js-new-thread-link" data-post="<%= post.id %>">
+              <i class="fas fa-fw fa-plus"></i> Start new comment thread
+            </a>
+            <% if CommentThread.post_followed?(post, current_user) %>
+              <%= link_to follow_post_comments_path(post_id: post.id), method: :post,
+                          class: "button is-muted is-outlined is-small",
+                          title: 'Don\'t follow new comment threads on this post' do %>
+                  <i class="fas fa-fw fa-bell-slash"></i> Unfollow new
               <% end %>
-            </p>
+            <% else %>
+              <%= link_to follow_post_comments_path(post_id: post.id), method: :post,
+                          class: "button is-muted is-outlined is-small",
+                          title: 'Follow all new comment threads on this post' do %>
+                <i class="fas fa-fw fa-bell"></i> Follow new
+              <% end %>
+            <% end %>
           <% end %>
           <div class="post--comments-container">
             <%= render 'comments/post', comment_threads: comment_threads.first(5) %>
@@ -492,7 +495,6 @@
                 <% elsif post.comments_disabled %>
                   <p class="has-color-red-500"><i class="fa fa-lock"></i> Comments have been disabled on this post, but as a moderator you are exempt from that block.</p>
                 <% end %>
-                <a class="button is-muted is-small js-new-thread-link" data-post="<%= post.id %>">Start new comment thread</a>
               <% end %>
                 <%= render 'comments/new_thread_modal', post: post %>
             <% end %>