consul/grecia
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Moves featured debates and proposals

Browse Source
This commit is contained in:
Alberto Garcia Cabeza
2016-01-07 17:05:21 +01:00
parent b84730aac0
commit 4ff27d3d16
4 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/assets/stylesheets/layout.scss
View File

@@ -511,8 +511,7 @@ header {
color: $text; color: $text;
display: inline-block; display: inline-block;
font-weight: bold; font-weight: bold;
margin-right: $line-height; margin-right: $line-height/2;
margin-right: 12px\9;
position: relative; position: relative;
text-align: left; text-align: left;

2
app/assets/stylesheets/participation.scss
View File

@@ -824,7 +824,7 @@
} }
.featured-debates-container, .featured-proposals-container { .featured-debates-container, .featured-proposals-container {
margin: 0 !important; margin: $line-height 0 !important;
h2 { h2 {
font-size: rem-calc(24); font-size: rem-calc(24);

8
app/views/debates/index.html.erb
View File

@@ -24,16 +24,16 @@
<% end %> <% end %>
</div> </div>
<% unless @tag_filter || @search_terms %>
<%= render "featured_debates_static" %>
<% end %>
<%= render 'shared/order_links', i18n_namespace: "debates.index" %> <%= render 'shared/order_links', i18n_namespace: "debates.index" %>
<div class="show-for-small-only"> <div class="show-for-small-only">
<%= link_to t("debates.index.start_debate"), new_debate_path, class: 'button radius expand' %> <%= link_to t("debates.index.start_debate"), new_debate_path, class: 'button radius expand' %>
</div> </div>
<% unless @tag_filter || @search_terms %>
<%= render "featured_debates_static" %>
<% end %>
<%= render @debates %> <%= render @debates %>
<%= paginate @debates %> <%= paginate @debates %>
</div> </div>

12
app/views/proposals/index.html.erb
View File

@@ -24,12 +24,6 @@
<% end %> <% end %>
</div> </div>
<%= render 'shared/order_links', i18n_namespace: "proposals.index" %>
<div class="show-for-small-only">
<%= link_to t("proposals.index.start_proposal"), new_proposal_path, class: 'button radius expand' %>
</div>
<% if @featured_proposals.present? %> <% if @featured_proposals.present? %>
<div id="featured-proposals" class="row featured-proposals-container"> <div id="featured-proposals" class="row featured-proposals-container">
<div class="small-12 medium-3 column"> <div class="small-12 medium-3 column">
@@ -48,6 +42,12 @@
</div> </div>
<% end %> <% end %>
<%= render 'shared/order_links', i18n_namespace: "proposals.index" %>
<div class="show-for-small-only">
<%= link_to t("proposals.index.start_proposal"), new_proposal_path, class: 'button radius expand' %>
</div>
<%= render partial: 'proposals/proposal', collection: @proposals %> <%= render partial: 'proposals/proposal', collection: @proposals %>
<%= paginate @proposals %> <%= paginate @proposals %>
</div> </div>