Skip to content

Commit

Permalink
Merge branch 'master' of github.com:okfn/ckan
Browse files Browse the repository at this point in the history
  • Loading branch information
kindly committed Apr 23, 2013
2 parents 744ff97 + b24d7dc commit 2be854b
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 23 deletions.
15 changes: 0 additions & 15 deletions ckan/public/base/css/main.css
Expand Up @@ -8946,21 +8946,6 @@ iframe {
.ie7 .masthead .account .dropdown-menu {
z-index: 10000;
}
.ie7 .footer-links {
*zoom: 1;
}
.ie7 .footer-links:before,
.ie7 .footer-links:after {
display: table;
content: "";
line-height: 0;
}
.ie7 .footer-links:after {
clear: both;
}
.ie7 .footer-links li {
float: left;
}
.ie7 .module-narrow .nav-item.image {
*zoom: 1;
}
Expand Down
8 changes: 0 additions & 8 deletions ckan/public/base/less/iehacks.less
Expand Up @@ -170,14 +170,6 @@
}
}

// Footer
.footer-links {
.clearfix;
li {
float: left;
}
}

// Navs
.module-narrow .nav-item.image {
.clearfix;
Expand Down

0 comments on commit 2be854b

Please sign in to comment.