Merge pull request #130 from marcelloc/master

move css style from last pull request to themes.

2 files changed, 5 insertions, 5 deletions

diff --git a/usr/local/www/fbegin.inc b/usr/local/www/fbegin.inc
index 34ebc09..1aede7f 100755
--- a/usr/local/www/fbegin.inc
+++ b/usr/local/www/fbegin.inc
@@ -253,9 +253,9 @@ if(! $g['disablehelpmenu']) {
 ?>
 
 <div id="wrapper">
-	<div id="header" style="height:40px;">
+	<div id="header">
 		<div id="header-left"><a href="/index.php" id="status-link"><img src="/themes/<?= $g['theme']; ?>/images/transparent.gif" border="0"></a></div>
-		<div id="header-right" style="height:30px;" >
+		<div id="header-right">
 			<div class="container">
 				<div class="left">webConfigurator</div>
 				<div class="right" id="menu_messages">
@@ -268,7 +268,7 @@ if(! $g['disablehelpmenu']) {
 	</div> <!-- Header DIV -->
 	<div id="content">
 		<div id="left">
-			<div id="navigation" style="z-index:1000;width:750px;" >
+			<div id="navigation" style="z-index:1000;">
 				<ul id="menu">
 					<li class="firstdrop">
 						<div><?php echo gettext("System"); ?></div>
diff --git a/usr/local/www/themes/pfsense_ng/all.css b/usr/local/www/themes/pfsense_ng/all.css
index b2f7540..c3c615e 100644
--- a/usr/local/www/themes/pfsense_ng/all.css
+++ b/usr/local/www/themes/pfsense_ng/all.css
@@ -218,7 +218,7 @@ iframe {
 #header-right {
 	position: relative;
 	/* background: url('images/header.gif') no-repeat; */
-	height: 70px;
+	height: 30px;
 	color: #fff;
 	left: 0px;
 	margin-left: 165px;
@@ -403,7 +403,7 @@ table#marquee div#container div#scroller {
 	position: fixed;
 	top: 0px;
 	left: 100px;
-	width: 810px;
+	width: 750px;
 	padding: 0px;
 	height: 28px;
 	z-index: 3;