Mercurial > moin-modernized
changeset 12:50ea991d017b
Move searchform and username to a common div, fix spacing in locationaline
| author | Radomir Dopieralski <devel@sheep.art.pl> |
|---|---|
| date | Fri, 16 May 2008 17:21:49 +0200 |
| parents | 16bdff2e2978 |
| children | 0232c96969fa |
| files | css/screen.css modernized.py |
| diffstat | 2 files changed, 15 insertions(+), 27 deletions(-) [+] |
line wrap: on
line diff
--- a/css/screen.css Fri May 16 17:12:55 2008 +0200 +++ b/css/screen.css Fri May 16 17:21:49 2008 +0200 @@ -79,22 +79,24 @@ text-decoration: none; } -#username { +#utils { float: right; clear: right; + text-align: right; +} +#utils[dir="rtl"] { + float: left; + clear: left; + text-align: left; +} + +#username { margin: 5px 12px; padding: 0; font-size: 0.82em; white-space: nowrap; } -*[dir="rtl"] #username { - text-align: left; - margin: 0; - float: left; - clear: left; -} - #username form { display: inline; } @@ -115,27 +117,16 @@ } #searchform { - float: right; - clear: right; margin: 0 10px; padding: 0; white-space: nowrap; font-size: 0.82em; } -*[dir="rtl"] #searchform { - float: left; - clear: left; -} - -#searchform form div { - display: inline; -} - #pagetrail { clear: right; display: inline; - margin: 5px 12px; + margin: 5px 0; padding: 0; font-size: 0.88em; } @@ -149,15 +140,10 @@ } #locationline { - clear: right; padding: 0; font-size: 100%; font-weight: normal; - margin: 5px 12px; -} - -*[dir="rtl"] #locationline { - clear: left; + margin: 1em 12px 5px 12px; } #pagelocation {
--- a/modernized.py Fri May 16 17:12:55 2008 +0200 +++ b/modernized.py Fri May 16 17:21:49 2008 +0200 @@ -27,9 +27,11 @@ # Header u'<div id="header">', + u'<div id="utils">', self.username(d), + self.searchform(d), + u'</div>', self.logo(), - self.searchform(d), u'<h1 id="locationline">', self.interwiki(d), self.title(d),
