From d393a15c4bf33bf4abada2b1c98692af7bd04127 Mon Sep 17 00:00:00 2001 From: Doug Bell Date: Fri, 20 Aug 2010 14:13:02 -0500 Subject: [PATCH] fix heights and positioning in the admin console --- lib/WebGUI/Admin.pm | 4 ++-- www/extras/admin/admin.css | 40 ++++++++++++++++++++++++++++++++------ 2 files changed, 36 insertions(+), 8 deletions(-) diff --git a/lib/WebGUI/Admin.pm b/lib/WebGUI/Admin.pm index 403a991d6..65aa8fa4b 100644 --- a/lib/WebGUI/Admin.pm +++ b/lib/WebGUI/Admin.pm @@ -609,8 +609,8 @@ __DATA__ -
-
+
+
diff --git a/www/extras/admin/admin.css b/www/extras/admin/admin.css index 53499f4c1..00af35204 100644 --- a/www/extras/admin/admin.css +++ b/www/extras/admin/admin.css @@ -3,31 +3,57 @@ font: 12pt Helvetica, sans-serif; } +html,body { margin: 0; padding: 0; height: 100% } + #wrapper { - margin-left: 160px; /* move out of the adminbar's way */ - min-width: 850px; /* min width for 1024x browsers */ + position: relative; + margin-left: 165px; /* move out of the adminbar's way */ + min-width: 400px; /* min width for 1024x browsers */ + height: 100%; +} + +#tabBar { + position: absolute; + top: 28px; /* Below the versionTag and user boxes */ + bottom: 0px; + left: 0px; + right: 0px; +} + +#tabBar #tab_wrapper { + position: absolute; + top: 34px; /* Below the tabs. */ + bottom: 0px; + left: 0px; + right: 0px; + margin-top: 44px; /* below the location bar, easier to change this in JS */ + overflow: hidden; } #versionTag { float: left; width: 57%; padding: 2px 1%; + margin: 2px; border: 1px solid #339; border-radius: 5px; -moz-border-radius: 5px; -webkit-border-radius: 5px; line-height: 16px; + height: 16px; } #user { float: right; width: 38%; padding: 2px 1%; + margin: 2px 2px 2px 0px; /* No margin for side next to version tag box */ border: 1px solid #339; border-radius: 5px; -moz-border-radius: 5px; -webkit-border-radius: 5px; line-height: 16px; + height: 16px; } #locationBar { @@ -83,10 +109,6 @@ text-align: right; } -#tabBar { - clear: both; -} - #wrapper .yui-content { margin: 0; padding: 0; } @@ -95,6 +117,12 @@ margin: 0; padding: 0; } +#viewTab iframe { + border: none; + width: 100%; + height: 100%; +} + .clickable { cursor: pointer; color: blue;