diff --git a/app/assets/stylesheets/participation.scss b/app/assets/stylesheets/participation.scss index 31e865849..6dbaac394 100644 --- a/app/assets/stylesheets/participation.scss +++ b/app/assets/stylesheets/participation.scss @@ -457,7 +457,7 @@ word-break: break-word; } -.proposal-show { +.proposal-show, .investment-project-show { .supports { padding: $line-height/2 0 0; @@ -671,20 +671,6 @@ .supports { @include supports; - background: none; - border: 0; - border-left: 1px solid $border; - margin: 0 rem-calc(-12); - min-height: rem-calc(180); - padding-top: 0; - - @include breakpoint(medium) { - padding-top: $line-height*1.5; - } - - &:after { - content: none; - } .investment-project-amount { color: $budget; @@ -714,33 +700,14 @@ font-weight: bold; } - .supported { - color: $budget; - margin-top: 0; - width: 100%; - } - .remove .icon-check-circle { display: block; font-size: rem-calc(70); line-height: rem-calc(70); } - - .share-supported { - - .ssb-twitter, - .ssb-facebook, - .ssb-google_plus { - color: $budget; - } - } } } -.investment-project-show .supports { - border: 0; -} - .proposals-summary { .panel { diff --git a/app/views/spending_proposals/_spending_proposal.html.erb b/app/views/spending_proposals/_spending_proposal.html.erb index 2854353bb..62e027913 100644 --- a/app/views/spending_proposals/_spending_proposal.html.erb +++ b/app/views/spending_proposals/_spending_proposal.html.erb @@ -49,7 +49,7 @@ -
+
<%= render 'votes', { spending_proposal: spending_proposal, vote_url: vote_spending_proposal_path(spending_proposal, value: 'yes') } %>
diff --git a/app/views/spending_proposals/_votes.html.erb b/app/views/spending_proposals/_votes.html.erb index 9ef7e75b3..e14d19bcb 100644 --- a/app/views/spending_proposals/_votes.html.erb +++ b/app/views/spending_proposals/_votes.html.erb @@ -1,4 +1,4 @@ -
+
<% reason = spending_proposal.reason_for_not_being_votable_by(current_user) %> <% voting_allowed = true unless reason.presence == :not_voting_allowed %> @@ -10,7 +10,7 @@
<% if user_voted_for %> -
+
<%= t("spending_proposals.spending_proposal.already_supported") %>
<% elsif voting_allowed %>