ipfire-new: Fix positioning of the page headline.

diff --git a/html/html/themes/ipfire-new/include/css/style.css b/html/html/themes/ipfire-new/include/css/style.css
index 1f1189adffb662d2e95403bd9074c8af4e37e14c..bfd1bf68ff5e85d19e7f19a76c821262afdf927e 100644 (file)
--- 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 a060ead7da7adf1adc281117f40ce025bc8af0a3..346b1fd21e4f8bd1be360a8a20d62626b7dc5918 100644 (file)
--- 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
 ;