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-01 23:40:38.000000000 +0100 @@ -1,5 +1,5 @@ /* screen.css - MoinMoin Default Styles - +classic Copyright (c) 2001, 2002, 2003 by Juergen Hermann */ @@ -154,38 +154,55 @@ 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: ""; } + + + * html #pagetrail li, * 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: ""; } 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-01 23:40:48.000000000 +0100 @@ -70,8 +70,8 @@ } #username { + margin: 5px 12px; display: inline; - margin: 0; padding: 0; text-align: right; font-size: 0.82em; @@ -92,6 +92,7 @@ } #username input { + display: inline; padding: 0; margin: 0; @@ -122,19 +123,8 @@ display: inline; } -#pagetrail { - clear: right; - display: block; - margin: 0.2em 0; - padding: 0; - font-size: 0.88em; -} - -*[dir="rtl"] #pagetrail { - clear: left; -} - #interwiki { + margin: 5px 12px; display: inline; font-size: 1em; } @@ -144,8 +134,9 @@ } #locationline { + clear: right; - padding: 3px 0; + padding: 0px 0; } *[dir="rtl"] #locationline { @@ -154,43 +145,67 @@ #pagelocation { display: inline; - margin: 0 0.25em; + margin: 0 0em; padding: 0; font-size: 1.5em; } -#pagetrail li, #pagelocation li { +#pagetrail { + margin: 5px 12px; + clear: right; + display: inline; + padding: 0; + font-size: 0.88em; +} + +*[dir="rtl"] #pagetrail { + clear: left; +} + +#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: ""; } -* html #pagetrail li, * html #pagelocation li { /* for broken IE */ +#pagetrail span:last-child:after { + content: ""; +} + +#pagetrail span:first-child:before { + content: ""; +} + + +* 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-01 23:40:29.000000000 +0100 @@ -1,5 +1,5 @@ /* screen.css - MoinMoin Default Styles - +rightsidebar Copyright (c) 2001, 2002, 2003 by Juergen Hermann */ @@ -36,6 +36,7 @@ background: #e5e5e5; border-bottom: 1px solid #9C9C9C; line-height: 1.1em; + } #logo { @@ -59,6 +60,7 @@ #logo a { color: black; text-decoration: none; + white-space: nowrap; } #searchform { @@ -156,9 +158,9 @@ } #pagetrail { + margin: 5px 11px; clear: right; - display: block; - margin: 0.2em 0; + display: inline; padding: 0; font-size: 0.88em; } @@ -168,6 +170,7 @@ } #interwiki { + margin: 5px 11px; display: inline; font-size: 1em; } @@ -192,34 +195,44 @@ 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 */ } @@ -227,6 +240,7 @@ content: ""; } + #navibar li.current { border: none; background: #BFAE8F;