Improves styles for spending proposals show

This commit is contained in:
Alberto Garcia Cabeza
2016-03-30 12:58:15 +02:00
parent c581aad9bf
commit d526c2effa
5 changed files with 6 additions and 122 deletions

View File

@@ -335,7 +335,7 @@
// 03. Show participation
// - - - - - - - - - - - - - - - - - - - - - - - - -
.debate-show, .proposal-show {
.debate-show, .proposal-show, .investment-project-show {
.social-share-full .social-share-button {
display:inline;
@@ -350,12 +350,11 @@
vertical-align: rem-calc(10);
}
.edit-debate, .edit-proposal {
margin-bottom: 0;
}
.debate-info, .proposal-info {
.debate-info, .proposal-info, .investment-project-info {
clear: both;
color: $text-medium;
font-size: $small-font-size;
@@ -613,24 +612,21 @@
.icon-debates, .icon-proposals, .icon-budget {
font-size: rem-calc(18);
line-height: $line-height;
position: absolute;
margin-left: rem-calc(6);
top: 0;
}
.icon-debates {
color: $debates;
left: rem-calc(48);
}
.icon-proposals {
color: $proposals;
left: rem-calc(72);
}
.icon-budget {
color: $budget;
font-size: $small-font-size;
left: rem-calc(122);
}
.debate-info, .proposal-info, .investment-project-info {
@@ -809,7 +805,7 @@
}
}
.investment-project {
.investment-project, .investment-project-show {
.supports {
@include supports;

View File

@@ -1,51 +0,0 @@
<%= form_for(@spending_proposal, url: form_url) do |f| %>
<%= render 'shared/errors', resource: @spending_proposal %>
<div class="row">
<div class="small-12 column">
<%= f.label :title, t("spending_proposals.form.title") %>
<%= f.text_field :title, maxlength: SpendingProposal.title_max_length, placeholder: t("spending_proposals.form.title"), label: false %>
</div>
<div class="ckeditor small-12 column">
<%= f.label :description, t("spending_proposals.form.description") %>
<%= f.cktext_area :description, maxlength: SpendingProposal.description_max_length, ckeditor: { language: I18n.locale }, label: false %>
</div>
<div class="small-12 column">
<%= f.label :external_url, t("spending_proposals.form.external_url") %>
<%= f.text_field :external_url, placeholder: t("spending_proposals.form.external_url"), label: false %>
</div>
<div class="small-12 column">
<%= f.label :geozone_id, t("spending_proposals.form.geozone") %>
<%= f.select :geozone_id, geozone_select_options, {include_blank: t("geozones.none"), label: false} %>
</div>
<div class="small-12 column">
<%= f.label :association_name, t("spending_proposals.form.association_name_label") %>
<%= f.text_field :association_name, placeholder: t("spending_proposals.form.association_name"), label: false %>
</div>
<div class="small-12 column">
<% if @spending_proposal.new_record? %>
<%= f.label :terms_of_service do %>
<%= f.check_box :terms_of_service, title: t('form.accept_terms_title'), label: false %>
<span class="checkbox">
<%= t("form.accept_terms",
policy: link_to(t("form.policy"), "/privacy", target: "blank"),
conditions: link_to(t("form.conditions"), "/conditions", target: "blank")).html_safe %>
</span>
<% end %>
<% end %>
</div>
<div class="small-12 column">
<%= f.simple_captcha input_html: { required: false } %>
</div>
<div class="actions small-12 column">
<%= f.submit(class: "button", value: t("spending_proposals.form.submit_buttons.#{action_name}")) %>
</div>
</div>
<% end %>

View File

@@ -1,27 +0,0 @@
<div class="spending-proposal-new row margin-top">
<div class="small-12 medium-9 column">
<%= link_to spending_proposals_path, class: "back" do %>
<span class="icon-angle-left"></span>
<%= t("spending_proposals.new.back_link") %>
<% end %>
<h1><%= t("spending_proposals.new.start_new") %></h1>
<div data-alert class="callout primary">
<%= link_to "/spending_proposals_info", title: t('shared.target_blank_html'), target: "_blank" do %>
<%= t("spending_proposals.new.more_info")%>
<% end %>
</div>
<%= render "spending_proposals/form", form_url: spending_proposals_url %>
</div>
<div class="small-12 medium-3 column">
<span class="icon-budget float-right"></span>
<h2><%= t("spending_proposals.new.recommendations_title") %></h2>
<ul class="recommendations">
<li><%= t("spending_proposals.new.recommendation_one") %></li>
<li><%= t("spending_proposals.new.recommendation_two") %></li>
<li><%= t("spending_proposals.new.recommendation_three") %></li>
</ul>
</div>
</div>

View File

@@ -1,34 +0,0 @@
<% provide :title do %><%= @spending_proposal.title %><% end %>
<section class="proposal-show">
<div id="<%= dom_id(@spending_proposal) %>" class="row">
<div class="small-12 medium-9 column">
<h1><%= @spending_proposal.title %></h1>
<div class="spending-proposal-info">
<%= render '/shared/author_info', resource: @spending_proposal %>
<span class="bullet">&nbsp;&bull;&nbsp;</span>
<%= l @spending_proposal.created_at.to_date %>
<span class="bullet">&nbsp;&bull;&nbsp;</span>
<%= geozone_name(@spending_proposal) %>
</div>
<%= safe_html_with_links @spending_proposal.description.html_safe %>
<% if @spending_proposal.external_url.present? %>
<div class="document-link">
<%= text_with_links @spending_proposal.external_url %>
</div>
<% end %>
</div>
<div id="<%= dom_id(@spending_proposal) %>_votes" class="small-12 medium-3 column text-center">
<%= render 'votes',
{ spending_proposal: @spending_proposal, vote_url: vote_spending_proposal_path(@spending_proposal, value: 'yes') } %>
</div>
</div>
</section>

View File

@@ -1,12 +1,12 @@
<% provide :title do %><%= @spending_proposal.title %><% end %>
<section class="proposal-show">
<section class="investment-project-show">
<div id="<%= dom_id(@spending_proposal) %>" class="row">
<div class="small-12 medium-9 column">
<h1><%= @spending_proposal.title %></h1>
<div class="spending-proposal-info">
<div class="investment-project-info">
<%= render '/shared/author_info', resource: @spending_proposal %>
<span class="bullet">&nbsp;&bull;&nbsp;</span>