From 1fa2a78cbec9537036bb2d1afc2b4dd0b48dce9f 2012-04-30 15:27:13 From: Bradley M. Kuhn Date: 2012-04-30 15:27:13 Subject: [PATCH] Merge commit 'refs/merge-requests/3' of git://gitorious.org/conservancy/website into merge-requests/denver I originally had those settings that Denver's changed because of a tutorial I read about handling a sidebar suggested them. I've accepted Denver's change, but am concerned that some browsers may not work. --- diff --git a/www/conservancy/static/conservancy.css b/www/conservancy/static/conservancy.css index 6779074b399859bfd86cb353e75bb2e506098ca9..72a106ed4dc36b21045492f213a96dd72b8b90ed 100644 --- a/www/conservancy/static/conservancy.css +++ b/www/conservancy/static/conservancy.css @@ -86,14 +86,10 @@ h3 { margin-top: .6em; margin-bottom: .4em; } background: #fffff; margin-left: 210px; margin-right: 50px; - padding-bottom: 32767px; - margin-bottom: -32767px; } #container #sidebar { width: 200px; float: left; - padding-bottom: 32767px; - margin-bottom: -32767px; background-color: #ccd4a3; } @@ -147,14 +143,10 @@ h3 { margin-top: .6em; margin-bottom: .4em; } .column-small { width: 31%; - padding-bottom: 32767px; - margin-bottom: -32767px; } .column-large { margin-left: 35%; margin-right: 50px; - padding-bottom: 32767px; - margin-bottom: -32767px; } .column-left { float: left; } @@ -237,4 +229,4 @@ body.conservancy-donate #navbar ul li.donate a /* NO COMMA HERE! */ color: #000033; font-weight: bold; background: #fff url(/img/nav-bg-up.png) top repeat-x; -} \ No newline at end of file +}