Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update footer links to current browse sections #471

Merged
merged 1 commit into from
Oct 16, 2014
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 12 additions & 11 deletions app/assets/stylesheets/helpers/_footer.scss
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

h2 {
margin: 0 15px;
padding: 10px 0 0;

@include media(tablet) {
padding: 0 0 20px;
Expand All @@ -40,26 +41,26 @@
ul {
@include core-16;
list-style: none;

padding: 10px 0 0;
margin: 0 15px 30px;
padding: 0;
margin: 0;

@include media(tablet){
padding: 20px 0 0;
margin: 0 15px;
}
@include ie-lte(7){
padding: 0; // for some reason IE6-7 gives the ul padding to each of the floated children
float: left;
margin: 15px 0 0 0;
width: 50%;
}


li {
display: block;
margin-bottom: 5px;

padding: 10px 0 0;
margin: 0 15px 5px;

@include media(tablet){
float: left;
margin: 15px 0 0 0;
width: 50%;
padding: 20px 0 0;
margin: 0 15px;
}
}
}
Expand Down
22 changes: 13 additions & 9 deletions app/views/root/_base.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -44,19 +44,23 @@
<h2>Services and information</h2>

<ul>
<li><a href="/browse/driving">Driving and transport</a></li>
<li><a href="/browse/benefits">Benefits</a></li>
<li><a href="/browse/business">Businesses and self-employed</a></li>
<li><a href="/browse/employing-people">Employing people</a></li>
<li><a href="/browse/abroad">Passports, travel and living abroad</a></li>
<li><a href="/browse/births-deaths-marriages">Births, deaths, marriages and care</a></li>
<li><a href="/browse/business">Business and self-employed</a></li>
<li><a href="/browse/citizenship">Citizenship and living in the UK</a></li>
<li><a href="/browse/justice">Crime, justice and the law</a></li>
<li><a href="/browse/disabilities">Disabled people</a></li>
<li><a href="/browse/driving">Driving and transport</a></li>
<li><a href="/browse/education">Education and learning</a></li>
<li><a href="/browse/working">Working, jobs and pensions</a></li>
</ul>
<ul>
<li><a href="/browse/employing-people">Employing people</a></li>
<li><a href="/browse/environment-countryside">Environment and countryside</a></li>
<li><a href="/browse/housing">Housing and local services</a></li>
<li><a href="/browse/justice">Crime, justice and the law</a></li>
<li><a href="/browse/tax">Money and tax</a></li>
<li><a href="/browse/births-deaths-marriages">Births, deaths, marriages and care</a></li>
<li><a href="/browse/disabilities">Disabled people</a></li>
<li><a href="/browse/citizenship">Citizenship and life in the UK</a></li>
<li><a href="/browse/abroad">Passports, travel and living abroad</a></li>
<li><a href="/visas-immigration">Visas and immigration</a></li>
<li><a href="/browse/working">Working, jobs and pensions</a></li>
</ul>
</div>

Expand Down