diff --git a/app/assets/stylesheets/participation.scss b/app/assets/stylesheets/participation.scss index fbcda0ebb..6a915ca54 100644 --- a/app/assets/stylesheets/participation.scss +++ b/app/assets/stylesheets/participation.scss @@ -255,7 +255,6 @@ .icon-debates, .icon-proposals, .icon-budget, - .icon-documents, .icon-image { font-size: rem-calc(50); line-height: $line-height; @@ -267,7 +266,6 @@ } .icon-proposals, - .icon-documents, .icon-image { color: $proposals; } @@ -358,8 +356,7 @@ width: rem-calc(48); } - .edit-debate, - .edit-proposal { + .edit-debate { margin-bottom: 0; } diff --git a/app/views/proposals/show.html.erb b/app/views/proposals/show.html.erb index 96999ca7d..2e4c1148f 100644 --- a/app/views/proposals/show.html.erb +++ b/app/views/proposals/show.html.erb @@ -113,6 +113,13 @@

<%= t("proposals.show.author") %>

+ <% if current_editable?(@proposal) %> + <%= link_to edit_proposal_path(@proposal), class: 'button hollow expanded' do %> + + <%= t("proposals.show.edit_proposal_link") %> + <% end %> + <% end %> + <% if author_of_proposal?(@proposal) %> <%= link_to new_proposal_notification_path(proposal_id: @proposal.id), class: 'button hollow expanded' do %> @@ -124,20 +131,13 @@ <% if can_destroy_image?(@proposal) %> <%= link_to image_path(@proposal.image, from: request.url), method: :delete, - class: 'button hollow expanded', + class: 'button hollow alert expanded', data: { confirm: t('images.actions.destroy.confirm') } do %> - + <%= t("images.remove_image") %> <% end %> <% end %> - <% if current_editable?(@proposal) %> - <%= link_to edit_proposal_path(@proposal), class: 'edit-proposal button hollow expanded' do %> - - <%= t("proposals.show.edit_proposal_link") %> - <% end %> - <% end %> -
<% end %>