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

Reformat OGL section & right-align copyright #263

Merged
merged 1 commit into from
Jun 28, 2013
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
Binary file added app/assets/images/open-government-licence.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
35 changes: 21 additions & 14 deletions app/assets/stylesheets/_footer.scss
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@
.footer-meta-inner {
display: inline-block;
vertical-align: bottom;
width: 74%;
width: 75%;

@include media-down(mobile) {
display: block;
Expand Down Expand Up @@ -226,21 +226,26 @@

.open-government-licence {
clear: left;
min-height: 42px;
background: transparent image-url("open-government-licence.png") no-repeat 0 center;
padding: 8px 0 0 53px;

h2 {
display: inline;
margin: 0 0.5em 0 0;
padding: 0;
@include media(mobile) {
background-image: image-url("open-government-licence_2x.png");
background-size: 41px 17px;
}

img {
width: 41px;
h2 {
position: absolute;
left: -9999em;
}

p {
@include core-16;
display: inline;
margin: 0;

a {
@include core-14;
}
}
}

Expand All @@ -258,8 +263,7 @@
float: none;
text-align: inherit;
width: 25%;
min-height: 150px;
min-height: 15rem;
padding-top: 15px;

@include ie-lte(7) {
display: block;
Expand All @@ -274,8 +278,8 @@
padding: 115px 0 0 0;
padding: 11.5rem 0 0 0;

background: transparent image-url("govuk-crest.png") no-repeat 50% 0;
text-align: center;
background: transparent image-url("govuk-crest.png") no-repeat 100% 0;
text-align: right;
text-decoration: none;

@include ie(6) {
Expand All @@ -296,7 +300,10 @@
margin: 30px 0 0 0;
margin: 3rem 0 0 0;

min-height: 0;
a {
text-align: center;
background-position: 50% 0%;
}
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion app/views/root/_footer_meta.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

<div class="open-government-licence">
<h2><a href="http://www.nationalarchives.gov.uk/doc/open-government-licence/"><%= image_tag 'open-government-licence_2x.png', alt: 'OGL' %></a></h2>
<p>All content is available under the <a href="http://www.nationalarchives.gov.uk/doc/open-government-licence/">Open Government Licence</a>, except where otherwise stated</p>
<p>All content is available under the <a href="http://www.nationalarchives.gov.uk/doc/open-government-licence/version/2">Open Government Licence v2.0</a>, except where otherwise stated</p>
</div>
</div>

Expand Down