From 634dc936f909dbd81d96ad1bc5addedd2f358f6c Mon Sep 17 00:00:00 2001 From: jenkr55 Date: Wed, 18 Apr 2018 19:32:24 -0500 Subject: [PATCH 1/3] Show second comment button when many comments --- app/views/posts/show.html.haml | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/app/views/posts/show.html.haml b/app/views/posts/show.html.haml index 3a50106a5..e283412a0 100644 --- a/app/views/posts/show.html.haml +++ b/app/views/posts/show.html.haml @@ -29,15 +29,17 @@ .col-md-2 = render partial: 'crops/thumbnail', locals: { crop: c } -.col-md-11 +.col-md-11.post-actions - if can?(:edit, @post) || can?(:destroy, @post) - .post-actions - - if can? :edit, @post - = link_to 'Edit Post', edit_post_path(@post), class: 'btn btn-default btn-xs' - - if can? :destroy, @post - = link_to 'Delete Post', @post, method: :delete, - data: { confirm: 'Are you sure?' }, - class: 'btn btn-default btn-xs' + - if can? :edit, @post + = link_to 'Edit Post', edit_post_path(@post), class: 'btn btn-default btn-xs' + - if can? :destroy, @post + = link_to 'Delete Post', @post, method: :delete, + data: { confirm: 'Are you sure?' }, + class: 'btn btn-default btn-xs' + - if @post.comments.count > 10 && can?(:create, Comment) + = link_to 'Comment', new_comment_path(post_id: @post.id), + class: 'btn btn-default btn-xs' = render partial: "comments", locals: { post: @post } From b3962bc9bc91bc466c73c56dab2de66dda826ef0 Mon Sep 17 00:00:00 2001 From: jenkr55 Date: Thu, 19 Apr 2018 12:10:19 -0500 Subject: [PATCH 2/3] Comment button same style --- app/assets/stylesheets/overrides.sass | 3 +++ app/views/posts/show.html.haml | 20 +++++++++++--------- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/app/assets/stylesheets/overrides.sass b/app/assets/stylesheets/overrides.sass index 6a97975fb..f93aa4368 100644 --- a/app/assets/stylesheets/overrides.sass +++ b/app/assets/stylesheets/overrides.sass @@ -193,6 +193,9 @@ li.crop-hierarchy .navbar-bottom margin: 40px 0px 0px 0px !important +.post-actions + margin-bottom: 1rem + // footer footer #footer1, #footer2, #footer3 diff --git a/app/views/posts/show.html.haml b/app/views/posts/show.html.haml index e283412a0..cca0f813d 100644 --- a/app/views/posts/show.html.haml +++ b/app/views/posts/show.html.haml @@ -29,17 +29,19 @@ .col-md-2 = render partial: 'crops/thumbnail', locals: { crop: c } -.col-md-11.post-actions +.col-md-11 - if can?(:edit, @post) || can?(:destroy, @post) - - if can? :edit, @post - = link_to 'Edit Post', edit_post_path(@post), class: 'btn btn-default btn-xs' - - if can? :destroy, @post - = link_to 'Delete Post', @post, method: :delete, - data: { confirm: 'Are you sure?' }, - class: 'btn btn-default btn-xs' + .post-actions + - if can? :edit, @post + = link_to 'Edit Post', edit_post_path(@post), class: 'btn btn-default btn-xs' + - if can? :destroy, @post + = link_to 'Delete Post', @post, method: :delete, + data: { confirm: 'Are you sure?' }, + class: 'btn btn-default btn-xs' + - if @post.comments.count > 10 && can?(:create, Comment) - = link_to 'Comment', new_comment_path(post_id: @post.id), - class: 'btn btn-default btn-xs' + .post-actions + = link_to 'Comment', new_comment_path(post_id: @post.id), class: 'btn btn-primary' = render partial: "comments", locals: { post: @post } From 4120069e4c2e1a386a51a6aa992c36f4fc515d97 Mon Sep 17 00:00:00 2001 From: jenkr55 Date: Thu, 19 Apr 2018 12:17:36 -0500 Subject: [PATCH 3/3] Fixing trailing whitespace --- app/assets/stylesheets/overrides.sass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/stylesheets/overrides.sass b/app/assets/stylesheets/overrides.sass index 42c42bbd1..dda6ecaef 100644 --- a/app/assets/stylesheets/overrides.sass +++ b/app/assets/stylesheets/overrides.sass @@ -201,7 +201,7 @@ li.crop-hierarchy .post-actions margin-bottom: 1rem - + // footer footer #footer1, #footer2, #footer3