Merge branch 'master' of https://github.com/okfn/ckan

ckan · May 3, 2012 · 2f4d2f3 · 2f4d2f3
2 parents 9d460be + 8660c03
commit 2f4d2f3
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/ckan/public/css/style.css b/ckan/public/css/style.css
@@ -126,10 +126,6 @@ footer a {
   text-decoration: none;
 }
 
-footer #footer-okf-logo {
-  margin-bottom: -4px;
-}
-
 footer h3 {
   font-size: 1.2em;
 }

diff --git a/ckan/templates/layout_base.html b/ckan/templates/layout_base.html
@@ -211,7 +211,7 @@ <h3 class="widget-title">Meta</h3>
             <img src="http://assets.okfn.org/images/logo/okf_logo_white_and_green_tiny.png" id="footer-okf-logo" />
             <a href="http://okfn.org/">Open Knowledge Foundation</a>
             Licensed under the <a href="http://opendatacommons.org/licenses/odbl/1.0/">Open Database License</a>
-            <a href="http://opendefinition.org/"><img alt="This Content and Data is Open" src="http://assets.okfn.org/images/ok_buttons/od_80x15_blue.png" style="border: none ; margin-bottom: -4px;"/></a>
+            <a href="http://opendefinition.org/"><img alt="This Content and Data is Open" src="http://assets.okfn.org/images/ok_buttons/od_80x15_blue.png" style="border: none;"/></a>
 
             <br/><br/>
             Powered by <a href="http://ckan.org">CKAN</a> v${c.__version__}.<br/>