From b2047b89f6dce71acc691acb86d5d82be4a6b462 Mon Sep 17 00:00:00 2001 From: nac26 Date: Mon, 12 Apr 2010 15:37:30 +0000 Subject: [PATCH] NIHVIVO-343 merging css fix to Site Admin layout in ie6 from maintenance branch --- themes/vivo-basic/css/blueprint/ie.css | 7 +++++++ themes/vivo-basic/css/screen.css | 1 + 2 files changed, 8 insertions(+) diff --git a/themes/vivo-basic/css/blueprint/ie.css b/themes/vivo-basic/css/blueprint/ie.css index 7c5483b3..787fc6a5 100644 --- a/themes/vivo-basic/css/blueprint/ie.css +++ b/themes/vivo-basic/css/blueprint/ie.css @@ -80,3 +80,10 @@ fieldset {padding-top: 0;} /* IE6 having trouble with the margins/padding on the admin panels */ /** html div.top { padding: 7px 0 1px 0; }*/ /** html div.bottom { padding: 1px 12px 16px 12px; }*/ + +/* the wonders of the IE6 float model...fix to maintain sanity in rendering sections of site admin */ +* html #adminDashboard .pageBodyGroup { + float: none; + display: inline; + vertical-align: top; +} \ No newline at end of file diff --git a/themes/vivo-basic/css/screen.css b/themes/vivo-basic/css/screen.css index 45d58ee0..a3f61868 100644 --- a/themes/vivo-basic/css/screen.css +++ b/themes/vivo-basic/css/screen.css @@ -433,6 +433,7 @@ are necessary for cross-browser consistency #adminDashboard .pageBodyGroup { float: left; clear: right; + display: inline-block; width: 45%; margin-top: 2em; margin-bottom: 1em;