diff -ur htdocs/classic/css/screen.css htdocs.reimar/classic/css/screen.css --- htdocs/classic/css/screen.css 2005-12-16 20:00:09.000000000 +0100 +++ htdocs.reimar/classic/css/screen.css 2006-01-02 00:23:06.000000000 +0100 @@ -1,5 +1,4 @@ /* screen.css - MoinMoin Default Styles - Copyright (c) 2001, 2002, 2003 by Juergen Hermann */ @@ -154,21 +153,34 @@ font-size: 1.5em; } -#pagetrail li, #pagelocation li { +* html #pagetrail span, * html #pagelocation span { /* for broken IE */ + border-left: 1px solid; + padding: 0 0.3em; +} + +#pagetrail span, #pagelocation li { display: inline; margin: 0; } /* XXX Warning: non-ascii characters! */ -#pagetrail li:after { +#pagetrail span:before { content: " » "; } -*[dir="rtl"] #pagetrail li:after { +*[dir="rtl"] #pagetrail span:after { content: " « "; } -#pagetrail li:last-child:after { +*[dir="rtl"] #pagetrail span:before { + content: ""; +} + +#pagetrail span:first-child:before { + content: ""; +} + +#pagetrail span:last-child:after { content: ""; } @@ -177,15 +189,15 @@ padding: 0 0.3em; } -#pagelocation li:after { +#pagelocation span:after { content: "/ "; } -*[dir="rtl"] #pagelocation li:after { +*[dir="rtl"] #pagelocation span:after { content: " \\ "; /* TODO: check what looks best with RTL */ } -#pagelocation li:last-child:after { +#pagelocation span:last-child:after { content: ""; } diff -ur htdocs/modern/css/screen.css htdocs.reimar/modern/css/screen.css --- htdocs/modern/css/screen.css 2005-12-16 20:00:09.000000000 +0100 +++ htdocs.reimar/modern/css/screen.css 2006-01-02 00:40:31.605319736 +0100 @@ -70,8 +70,8 @@ } #username { + margin: 5px 12px; display: inline; - margin: 0; padding: 0; text-align: right; font-size: 0.82em; @@ -123,9 +123,9 @@ } #pagetrail { + margin: 5px 12px; clear: right; - display: block; - margin: 0.2em 0; + display: inline; padding: 0; font-size: 0.88em; } @@ -135,6 +135,7 @@ } #interwiki { + margin: 5px 12px; display: inline; font-size: 1em; } @@ -145,7 +146,7 @@ #locationline { clear: right; - padding: 3px 0; + padding: 0; } *[dir="rtl"] #locationline { @@ -154,43 +155,52 @@ #pagelocation { display: inline; - margin: 0 0.25em; + margin: 0; padding: 0; font-size: 1.5em; } -#pagetrail li, #pagelocation li { +#pagetrail span, #pagelocation li { display: inline; margin: 0; } /* XXX Warning: non-ascii characters! */ -#pagetrail li:after { +#pagetrail span:before { content: " » "; } -*[dir="rtl"] #pagetrail li:after { +*[dir="rtl"] #pagetrail span:after { content: " « "; } -#pagetrail li:last-child:after { +*[dir="rtl"] #pagetrail span:before { + content: ""; +} + +#pagetrail span:last-child:after { + content: ""; +} + +#pagetrail span:first-child:before { content: ""; } -* html #pagetrail li, * html #pagelocation li { /* for broken IE */ +* html #pagetrail span, * html #pagelocation span { /* for broken IE */ border-left: 1px solid #AAA; padding: 0 0.3em; } -#pagelocation li:after { +#pagelocation span:after { content: "/ "; + display: inline; } -*[dir="rtl"] #pagelocation li:after { +*[dir="rtl"] #pagelocation span:after { content: " \\ "; /* TODO: check what looks best with RTL */ } -#pagelocation li:last-child:after { +#pagelocation span:last-child:after { content: ""; } Nur in htdocs.reimar: newlogo.png. diff -ur htdocs/rightsidebar/css/screen.css htdocs.reimar/rightsidebar/css/screen.css --- htdocs/rightsidebar/css/screen.css 2005-12-16 20:00:10.000000000 +0100 +++ htdocs.reimar/rightsidebar/css/screen.css 2006-01-02 00:42:40.947656712 +0100 @@ -59,6 +59,7 @@ #logo a { color: black; text-decoration: none; + white-space: nowrap; } #searchform { @@ -156,9 +157,9 @@ } #pagetrail { + margin: 5px 11px; clear: right; - display: block; - margin: 0.2em 0; + display: inline; padding: 0; font-size: 0.88em; } @@ -168,6 +169,7 @@ } #interwiki { + margin: 5px 11px; display: inline; font-size: 1em; } @@ -192,38 +194,47 @@ font-size: 1.5em; } -#pagetrail li, #pagelocation li { +#pagetrail span, #pagelocation li { display: inline; margin: 0; } /* XXX Warning: non-ascii characters! */ -#pagetrail li:after { +#pagetrail span:before { content: " » "; } -*[dir="rtl"] #pagetrail li:after { +*[dir="rtl"] #pagetrail span:after { content: " « "; } -#pagetrail li:last-child:after { +*[dir="rtl"] #pagetrail span:before { + content: ""; +} + + +#pagetrail span:first-child:before { + content: ""; +} + +#pagetrail span:last-child:after { content: ""; } -* html #pagetrail li, * html #pagelocation li { /* for broken IE */ +* html #pagetrail span, * html #pagelocation li { /* for broken IE */ border-left: 1px solid #AAA; padding: 0 0.3em; } -#pagelocation li:after { +#pagelocation span:after { content: "/ "; } -*[dir="rtl"] #pagelocation li:after { +*[dir="rtl"] #pagelocation span:after { content: " \\ "; /* TODO: check what looks best with RTL */ } -#pagelocation li:last-child:after { +#pagelocation span:last-child:after { content: ""; }