changeset 190:63d33f46ebea

introduce header div for classic, css fixes for modern and rightsidebar imported from: moin--main--1.5--patch-192
author Thomas Waldmann <tw@waldmann-edv.de>
date Fri, 04 Nov 2005 08:12:43 +0000
parents 3a013e5fadd0
children e5ca7fa46f2e
files MoinMoin/theme/classic.py wiki/htdocs/classic/css/common.css wiki/htdocs/classic/css/screen.css wiki/htdocs/modern/css/screen.css wiki/htdocs/rightsidebar/css/screen.css
diffstat 5 files changed, 10 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/theme/classic.py	Fri Nov 04 07:38:48 2005 +0000
+++ b/MoinMoin/theme/classic.py	Fri Nov 04 08:12:43 2005 +0000
@@ -108,6 +108,7 @@
         html = """
 %(config_header1_html)s
 
+<div id="header">
 %(logo_html)s
 %(search_form_html)s
 %(username_html)s
@@ -117,6 +118,7 @@
 %(iconbar_html)s
 %(navibar_html)s
 %(msg_html)s
+</div>
 
 %(config_header2_html)s
 
--- a/wiki/htdocs/classic/css/common.css	Fri Nov 04 07:38:48 2005 +0000
+++ b/wiki/htdocs/classic/css/common.css	Fri Nov 04 08:12:43 2005 +0000
@@ -19,7 +19,6 @@
 
 h1, h2, h3, h4, h5, h6
 {
-	line-height: 1.2em;
 	border-bottom: 4px solid #EDD097;
 }	
 
--- a/wiki/htdocs/classic/css/screen.css	Fri Nov 04 07:38:48 2005 +0000
+++ b/wiki/htdocs/classic/css/screen.css	Fri Nov 04 08:12:43 2005 +0000
@@ -34,6 +34,12 @@
 
 /* user interface styles */
 
+#header {
+    margin: 0;
+    padding: 0;
+    line-height: 1.1em;
+}
+
 #logo {
 	/* contains image and/or text link */
 	float: left;
--- a/wiki/htdocs/modern/css/screen.css	Fri Nov 04 07:38:48 2005 +0000
+++ b/wiki/htdocs/modern/css/screen.css	Fri Nov 04 08:12:43 2005 +0000
@@ -43,6 +43,7 @@
     padding: 0;
     /* background: #3D4551; */
     background: #E7E7E7;
+    line-height: 1.1em;
 }
 
 #logo {
--- a/wiki/htdocs/rightsidebar/css/screen.css	Fri Nov 04 07:38:48 2005 +0000
+++ b/wiki/htdocs/rightsidebar/css/screen.css	Fri Nov 04 08:12:43 2005 +0000
@@ -35,6 +35,7 @@
 #header {
     background: #e5e5e5;
     border-bottom: 1px solid #9C9C9C;
+    line-height: 1.1em;
 }
 
 #logo {