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

adds unordered list on footer and top links

Browse Source
This commit is contained in:
Alberto Garcia Cabeza
2016-12-05 17:18:11 +01:00
parent 3b2fe1e184
commit ec13036955
3 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -366,6 +366,10 @@ header {
text-decoration: underline; text-decoration: underline;
} }
} }
ul {
margin-bottom: 0;
}
} }
.subnavigation { .subnavigation {
@@ -509,7 +513,7 @@ footer {
p { p {
font-size: $small-font-size; font-size: $small-font-size;
.info a { &.info a {
text-decoration: underline; text-decoration: underline;
} }
} }
@@ -546,6 +550,7 @@ footer {
.subfooter { .subfooter {
border-top: 1px solid $text-light; border-top: 1px solid $text-light;
font-size: $small-font-size;
padding-top: $line-height/2; padding-top: $line-height/2;
} }

14
app/views/layouts/_footer.html.erb
View File

@@ -41,13 +41,13 @@
<div class="subfooter row"> <div class="subfooter row">
<div class="small-12 medium-8 column"> <div class="small-12 medium-8 column">
<p> <%= t("layouts.footer.copyright", year: Time.current.year) %>&nbsp;|
<%= t("layouts.footer.copyright", year: Time.current.year) %>&nbsp;|&nbsp; <ul class="no-bullet inline-block">
<%= link_to t("layouts.footer.more_info"), page_path('more_information') %>&nbsp;|&nbsp; <li class="inline-block"><%= link_to t("layouts.footer.more_info"), page_path('more_information') %>&nbsp;|</li>
<%= link_to t("layouts.footer.privacy"), page_path('privacy') %>&nbsp;|&nbsp; <li class="inline-block"><%= link_to t("layouts.footer.privacy"), page_path('privacy') %>&nbsp;|</li>
<%= link_to t("layouts.footer.conditions"), page_path('conditions') %>&nbsp;|&nbsp; <li class="inline-block"><%= link_to t("layouts.footer.conditions"), page_path('conditions') %>&nbsp;|</li>
<%= link_to t("layouts.footer.accessibility"), page_path('accessibility') %> <li class="inline-block"><%= link_to t("layouts.footer.accessibility"), page_path('accessibility') %></li>
</p> </ul>
</div> </div>
<div class="small-12 medium-4 column social"> <div class="small-12 medium-4 column social">

11
app/views/shared/_top_links.html.erb
View File

@@ -1,15 +1,16 @@
<div class="top-links hide-for-small-only"> <div class="top-links hide-for-small-only">
<div class="row"> <div class="row">
<%= render "shared/locale_switcher" %> <%= render "shared/locale_switcher" %>
<div class="external-links"> <ul class="no-bullet external-links">
<%= link_to t("layouts.header.external_link_transparency"), t("layouts.header.external_link_transparency_url") %>&nbsp;| <li class="inline-block"><%= link_to t("layouts.header.external_link_transparency"), t("layouts.header.external_link_transparency_url") %>&nbsp;|</li>
<%= link_to t("layouts.header.external_link_opendata"), "/opendata", class: ("selected" if current_page?("/opendata")) %> <li class="inline-block"><%= link_to t("layouts.header.external_link_opendata"), "/opendata", class: ("selected" if current_page?("/opendata")) %></li>
<% if setting['blog_url'] %> <% if setting['blog_url'] %>
&nbsp;| <li class="inline-block">|&nbsp;
<%= link_to setting['blog_url'], title: t('shared.target_blank_html'), target: "_blank" do %> <%= link_to setting['blog_url'], title: t('shared.target_blank_html'), target: "_blank" do %>
<%= t("layouts.header.external_link_blog") %> <%= t("layouts.header.external_link_blog") %>
<% end %> <% end %>
</li>
<% end %> <% end %>
</div> </ul>
</div> </div>
</div> </div>