From eb6389d09de11b2aad940d5bbacb5e2a28ce79fa Mon Sep 17 00:00:00 2001
From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 5 Jan 2014 14:50:34 +0100
Subject: [PATCH] ipfire-new: Fix positioning of the page headline.

---
 .../themes/ipfire-new/include/css/style.css   | 20 +++++--------------
 .../themes/ipfire-new/include/functions.pl    |  3 ++-
 2 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/html/html/themes/ipfire-new/include/css/style.css b/html/html/themes/ipfire-new/include/css/style.css
index 1f1189adff..bfd1bf68ff 100644
--- a/html/html/themes/ipfire-new/include/css/style.css
+++ b/html/html/themes/ipfire-new/include/css/style.css
@@ -365,20 +365,6 @@ color: #fff;
 font-size: 3.6em;
 }
 
-#logo h2
-{
-position: relative;
-width: 300px;
-height: 20px;
-top: 70px;
-left: 0px;
-display: block;
-padding-left: 0.5em;
-color: #880400;
-font-size: 14px;
-z-index: 1;
-}
-
 
 /* Main */
 
@@ -412,7 +398,11 @@ margin-bottom: 2.0em;
 position: relative;
 width: 910px;
 margin: 0 auto;
-padding-top: 3.5em;
+padding-top: 1.5em;
+}
+
+#main_inner h1 {
+	margin-bottom: 1em;
 }
 
 #main_inner h3,h4
diff --git a/html/html/themes/ipfire-new/include/functions.pl b/html/html/themes/ipfire-new/include/functions.pl
index a060ead7da..346b1fd21e 100644
--- a/html/html/themes/ipfire-new/include/functions.pl
+++ b/html/html/themes/ipfire-new/include/functions.pl
@@ -160,7 +160,6 @@ END
 	}
 
 print <<END
-				<h2>$h2</h2>
 			</div>
 		</div>
 END
@@ -171,6 +170,8 @@ END
 print <<END
 <div id="main">
 	<div id="main_inner" class="fixed">
+		<h1>$h2</h1>
+
 		<div id="columnA_2columns">
 END
 ;
-- 
2.39.5