From 390d11f69cc6c9ed8fab6304eeb5597a529c0b9b Mon Sep 17 00:00:00 2001 From: Adam Amstrong Date: Fri, 23 Sep 2011 16:52:44 +0000 Subject: [PATCH] FUCK YOU, CROSSBROWSER CHROME/FIREFOX TABS. FUCK YOU AND THE HORSE YOU RODE IN ON. ADAMA WINS! git-svn-id: http://www.observium.org/svn/observer/trunk@2568 61d68cd4-352d-0410-923a-c4978735b2b8 --- html/css/styles.css | 38 +++++++++++++----------------- html/index.php | 2 ++ html/pages/device.inc.php | 9 +++---- html/pages/device/overview.inc.php | 8 ++++--- 4 files changed, 29 insertions(+), 28 deletions(-) diff --git a/html/css/styles.css b/html/css/styles.css index a0acc454cc..493d6b6035 100644 --- a/html/css/styles.css +++ b/html/css/styles.css @@ -1,7 +1,7 @@ body { font-family: Verdana, Arial, Helvetica, sans-serif; margin: 0px; - padding: 0px 0px 0px 0px; + padding: 0px; background: rgb(249,249,249); /* Old browsers */ background: -moz-linear-gradient(top, rgba(249,249,249,1) 0%, rgba(255,255,255,1) 100%); /* FF3.6+ */ background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(249,249,249,1)), color-stop(100%,rgba(255,255,255,1))); /* Chrome,Safari4+ */ @@ -10,11 +10,15 @@ body { background: -ms-linear-gradient(top, rgba(249,249,249,1) 0%,rgba(255,255,255,1) 100%); /* IE10+ */ filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#f9f9f9', endColorstr='#ffffff',GradientType=0 ); /* IE6-9 */ background: linear-gradient(top, rgba(249,249,249,1) 0%,rgba(255,255,255,1) 100%); /* W3C */ - color: #666; + color: #555; font-size: 10pt; line-height: 20px; } +ul { margin: 0px; padding: 0px; list-style: disc outside; } +ul ul { list-style: circle outside; } +ul ul ul { list-style: square outside; } + .rounded-2px { /* Rounded Corners */ -moz-border-radius: 2px; @@ -565,10 +569,6 @@ form { margin: 0px; padding: 0px; } hr { border: 0px; height: 1px; background-color: #ccc; color: #ccc; } p { margin: 0px; padding: 0px; } -ul { margin: 0px 24px; padding: 0px; list-style: disc outside; } -ul ul { margin-top: 0px; padding-top: 0px; list-style: circle outside; } -ul ul ul { margin-top: 0px; padding-top: 0px; list-style: square outside; } - a { text-decoration:none; color: #00f; } a:visited { text-decoration:none; color: #00f; } a:hover { text-decoration:underline; color: #00f; } @@ -577,7 +577,6 @@ a:active { color: #00f; } .vspace { margin-top: 4px; margin-bottom: 4px; } p.vspace { padding-top: 3px; padding-bottom: 3px; } .content-mat { padding: 0px; margin: auto; display:block; } - .clearer { clear: both; display: block; padding: 0px; height: 0px; line-height: 1px; font-size: 0px; } .borderless-table tr td { border: none } @@ -1272,22 +1271,17 @@ a.interface-upup:hover, a.interface-updown:hover, a.interface-admindown:hover { -#### TABS - .tabBox .tabs { - margin: 0; - padding: 0 10px; overflow: hidden; + padding: 0px 10px; margin-bottom: -1px; - height: 2.25em; + } .tabBox .tabs li { float: left; list-style: none; - margin: 0; - padding: .25em .25em 0; - height: 2em; + padding: .125em .125em 0; overflow: hidden; position: relative; z-index: 1; @@ -1300,18 +1294,18 @@ a.interface-upup:hover, a.interface-updown:hover, a.interface-admindown:hover { .tabBox .tabs a { float: left; - height: 2em; - line-height: 2em; + height: 1.7em; + line-height: 1.7em; -webkit-border-radius: 8px 8px 0 0; -moz-border-radius: 8px 8px 0 0; border-radius: 8px 8px 0 0; background: #EEE; border: 1px solid #CCC; border-bottom: 0; - padding: 0 10px; + padding: 0 8px; color: #000; text-decoration: none; - behavior: url(PIE.htc); + behavior: url(/css/PIE.htc); } .tabBox .tabs .selected a { @@ -1332,10 +1326,12 @@ a.interface-upup:hover, a.interface-updown:hover, a.interface-admindown:hover { } .tabBox .tabcontent { + margin-top -2px; + min-height: 600px; clear: left; position: relative; z-index: 2; - padding: 2em 1em; + padding: 10px; border: 1px solid #CCC; background: #FFF; -webkit-border-radius: 3px; @@ -1344,5 +1340,5 @@ a.interface-upup:hover, a.interface-updown:hover, a.interface-admindown:hover { -webkit-box-shadow: #CCC 0 0 .25em; -moz-box-shadow: #CCC 0 0 .25em; box-shadow: #CCC 0 0 .25em; - behavior: url(PIE.htc); + behavior: url(/css/PIE.htc); } diff --git a/html/index.php b/html/index.php index a5f2162b93..fc1e0faac8 100755 --- a/html/index.php +++ b/html/index.php @@ -243,6 +243,7 @@ if(!$vars['bare'] == "yes") { ?>
+
Generated in ' . $gentime . ' seconds.'); } +echo('
'); echo('
'); ?> diff --git a/html/pages/device.inc.php b/html/pages/device.inc.php index 017ca5cde5..833ed7e89c 100644 --- a/html/pages/device.inc.php +++ b/html/pages/device.inc.php @@ -30,7 +30,8 @@ if (device_permitted($vars['device']) || $check_device == $vars['device']) echo(''); echo('
'); - echo(' "); + } if (device_permitted($device['device_id']) || $check_device == $vars['device']) { echo('
'); diff --git a/html/pages/device/overview.inc.php b/html/pages/device/overview.inc.php index 755c5fa4f3..d58fa205bf 100644 --- a/html/pages/device/overview.inc.php +++ b/html/pages/device/overview.inc.php @@ -15,7 +15,7 @@ $services['disabled'] = dbFetchCell("SELECT COUNT(service_id) FROM `services` WH if ($services['down']) { $services_colour = $warn_colour_a; } else { $services_colour = $list_colour_a; } if ($ports['down']) { $ports_colour = $warn_colour_a; } else { $ports_colour = $list_colour_a; } -echo("
"); +echo(""); -echo("
"); +echo("
"); @@ -71,9 +71,9 @@ if (count($syslog)) echo(""); } -echo(""); +echo(""); ### Right Pane include("overview/processors.inc.php"); @@ -103,4 +103,6 @@ foreach ($eventlog as $entry) echo("
"); echo("
"); +echo(""); + ?>