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

merges master and fix conflicts

Browse Source
This commit is contained in:
kikito
2015-09-12 19:54:15 +02:00
parent 07b99fcf19 f97fc56bb7
commit 5903ebe857
41 changed files with 279 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/views/layouts/_header.html.erb
View File

@@ -33,7 +33,7 @@
<section class="subnavigation row">
<%#= link_to t("layouts.header.welcome"), root_path %>
<%#= link_to t("layouts.header.initiatives"), "#" %>
<div class="small-8 column">
<div class="small-12 medium-8 column">
<%= link_to t("layouts.header.debates"), debates_path, class: ("active" if current_page?(controller: "/debates")) %>
<%= link_to t("layouts.header.proposals"), proposals_path, class: ("active" if current_page?(controller: "/proposals")) %>
<%= link_to t("layouts.header.more_information"), "/more_information", class: ("active" if current_page?("/more_information")) %>
@@ -49,12 +49,12 @@
</div>
<% if home_page? %>
<div class="row">
<div class="row home-page">
<div class="small-12 medium-7 column">
<h1><%= t("layouts.header.open_city_title") %></h1>
<p><%= t("layouts.header.open_city_slogan") %></p>
<%= link_to t("layouts.header.see_all_debates"), debates_path, class: "button radius" %>
<%= link_to t("layouts.header.see_all_proposals"), proposals_path, class: "button radius" %>
<%= link_to t("layouts.header.see_all_debates"), debates_path, class: "button radius see-more" %>
<%= link_to t("layouts.header.see_all_proposals"), proposals_path, class: "button radius see-more" %>
<%= link_to t("layouts.header.more_information"), "/more_information", class: "more-info" %>
</div>