diff --git a/css/_admin.css b/css/_admin.css index c5d1887..e466436 100644 --- a/css/_admin.css +++ b/css/_admin.css @@ -7,7 +7,7 @@ float: left; width: 40%; list-style-type: none; - font-size: 115%; + font-size: 1.125em; } .dokuwiki ul.admin_tasks li { diff --git a/css/_links.css b/css/_links.css index d62a4de..7e7f182 100644 --- a/css/_links.css +++ b/css/_links.css @@ -34,10 +34,12 @@ .dokuwiki a.urlextern, .dokuwiki a.windows, -.dokuwiki a.mail { +.dokuwiki a.mail, +.dokuwiki a.mediafile, +.dokuwiki a.interwiki { background-repeat: no-repeat; background-position: 0 center; - padding-left: 17px; + padding: 0 0 0 17px; } /* external link */ .dokuwiki a.urlextern { @@ -55,10 +57,7 @@ /* icons of the following are set by dokuwiki in lib/exe/css.php */ /* link to some embedded media */ .dokuwiki a.mediafile { - background-position: 0 center; - padding-bottom: 0; } /* interwiki link */ .dokuwiki a.interwiki { - background-position: 0 center; } diff --git a/css/_mediamanager.css b/css/_mediamanager.css index 01e23ef..d47e581 100644 --- a/css/_mediamanager.css +++ b/css/_mediamanager.css @@ -20,7 +20,7 @@ html.popup { overflow: auto; position: absolute; left: 0; - border-right: solid 1px __border__; + border-right: 1px solid __border__; } #mediamgr__aside .pad { padding: .5em; @@ -208,6 +208,9 @@ form#dw__mediasearch input.button { margin: 0; } #media__content form.meta textarea.edit { + /* needed because of IE8 hack in _edit.css for textarea.edit: */ + max-width: 70%; + min-width: 70%; } #media__content form.meta div.buttons { diff --git a/css/_recent.css b/css/_recent.css index 75d3a2d..9e35c12 100644 --- a/css/_recent.css +++ b/css/_recent.css @@ -51,11 +51,8 @@ text-align: center; margin: 1.4em 0; } -.dokuwiki div.pagenav-prev { - display: inline; - margin-right: .5em; -} +.dokuwiki div.pagenav-prev, .dokuwiki div.pagenav-next { display: inline; - margin-left: .5em; + margin: 0 .5em; } diff --git a/css/rtl.css b/css/rtl.css index d0f67dc..e15b958 100644 --- a/css/rtl.css +++ b/css/rtl.css @@ -1,14 +1,11 @@ -/* TODO */ - /** * This file provides layout and design corrections for right-to-left * languages. * - * @author Andreas Gohr - * @author Dotan Kamber + * @author Anika Henke */ -/*..... new code ........................................................................*/ +/*____________ basic ____________*/ body, caption, @@ -20,127 +17,282 @@ th { ul, ol { padding: 0 1.5em 0 0; } - li, dd { margin: 0 1.5em 0 0; } - blockquote { border-width: 0 .25em 0 0; } +h1, h2, h3, h4, h5, h6, +caption, legend { + clear: right; +} + + +/*____________ structure ____________*/ + +#dokuwiki__header .headings { + float: right; +} +#dokuwiki__header .tools { + float: left; + text-align: left; +} -/*..... @todo: old code ........................................................................*/ +.mode_show #dokuwiki__aside { + float: right; +} +#dokuwiki__aside .pad { + margin: 0 0 0 1.5em; +} + +.mode_show #dokuwiki__content { + float: left; + margin-left: 0; + margin-right: -16em; +} +.mode_show #dokuwiki__content .pad { + margin-left: 0; + margin-right: 16em; +} + +/*____________ design ____________*/ + +#dokuwiki__header form.search #qsearch__in { + margin-right: 0; + margin-left: .5em; +} -.bar-left { - float: right; - text-align: right; +#dokuwiki__aside ul, #dokuwiki__aside ol { + padding-right: 0; } -.bar-right { - float: left; - text-align: left; +/*____________ content ____________*/ + +/* section indenting +.dokuwiki h1 {margin-left: 0; margin-right: 0;} +.dokuwiki h2 {margin-left: 0; margin-right: .666em;} +.dokuwiki h3 {margin-left: 0; margin-right: 1.776em;} +.dokuwiki h4 {margin-left: 0; margin-right: 3em;} +.dokuwiki h5 {margin-left: 0; margin-right: 4.5712em;} +.dokuwiki div.level1 {margin-left: 0; margin-right: 0;} +.dokuwiki div.level2 {margin-left: 0; margin-right: 1em;} +.dokuwiki div.level3 {margin-left: 0; margin-right: 2em;} +.dokuwiki div.level4 {margin-left: 0; margin-right: 3em;} +.dokuwiki div.level5 {margin-left: 0; margin-right: 4em;} +*/ + +.dokuwiki dl.code dt, +.dokuwiki dl.file dt { + margin-left: 0; + margin-right: 1em; } -.pagename { - float: right; - text-align: right; +.JSpopup ul, +.JSpopup ol { + padding-right: 0; } -.logo { - float: left; - text-align: left; + +/*____________ _imgdetail ____________*/ + +#dokuwiki__detail div.content img { + float: right; + margin-right: 0; + margin-left: 1.5em; +} +#dokuwiki__detail div.content div.img_detail { + float: right } -label { - text-align: left; + +/*____________ _mediamanager ____________*/ + +#mediamgr__aside { + left: auto; + right: 0; + border-right-width: 0; + border-left: 1px solid __border__; +} +#mediamgr__content { + right: auto; + left: 0; } -label.simple { - text-align: right; +#media__opts input { + margin-right: 0; + margin-left: .3em; } -div.meta div.user { - float: right +#media__tree ul { + padding-left: 0; + padding-right: .2em; +} +#media__tree ul li { + clear: right; + margin-right: 0; +} +#media__tree ul li img { + float: right; + padding: .5em 0 0 .3em; +} +#media__tree ul li li { + margin-left: 0; + margin-right: 1.5em; } -div.meta div.doc { - text-align: left; +#media__content a.mediafile { + margin-right: 0; + margin-left: 1.5em; +} +#media__content div.detail div.thumb { + float: right; + margin: 0 18px 0 .5em; +} +#media__content form.meta div.metafield { + clear: right; } +#media__content form.meta label { + float: right; + clear: right; +} +#media__content form.meta .edit { + float: right; +} +#media__content form.meta div.buttons { + clear: right; + margin: .2em 25% 0 0; +} + -/* ------------------ Design corrections --------------------------------- */ +/*____________ _links ____________*/ -div.dokuwiki ul, -div.dokuwiki ol { - margin: 0.5em 1.5em 0.5em 0; +/* if link icons don't work as expected, remove the following lines */ +.dokuwiki a.urlextern, +.dokuwiki a.windows, +.dokuwiki a.mail, +.dokuwiki a.interwiki, +.dokuwiki a.mediafile { + background-position: right center; + padding: 0 17px 0 0; } -div.dokuwiki a.urlextern, -div.dokuwiki a.interwiki, -div.dokuwiki a.windows, -div.dokuwiki a.mail, -div.dokuwiki a.mail.JSnocheck { - /* should work but doesn't - so we just disable icons here*/ - /* - background-position: right 1px; - padding-right: 16px; - */ - background-image: none !important; - padding: 0px 0px 0px 0px; + +/*____________ _toc ____________*/ + +.dokuwiki div.toc { + float: left; + margin: 0 1.4em 1.4em 0; +} +.dokuwiki .toc span.toc_open, +.dokuwiki .toc span.toc_close { + float: left; + margin: 0 0 0 .2em; +} +.dokuwiki #toc__inside ul ul { + padding-left: 0; + padding-right: 1em; +} +.dokuwiki ul.idx { + padding-right: 0; } -div.dokuwiki div.secedit input.button { - float: left; + +/*____________ _footnotes ____________*/ + + +/*____________ _search ____________*/ + +.dokuwiki div.search_quickresult ul li { + float: right; } +.dokuwiki form.search div.ajax_qsearch { + left: auto; + right: -13.5em; + text-align: right; +} + + +/*____________ _recent ____________*/ -/* headlines */ -div.dokuwiki h1, div.dokuwiki h2, div.dokuwiki h3, div.dokuwiki h4, div.dokuwiki h5 { - clear: right; +.dokuwiki #dw__recent ul li, +.dokuwiki #page__revisions ul li { + margin-right: 0; } -/* special headlines */ -div.dokuwiki h1 {margin-left: 0px; margin-right: 0px;} -div.dokuwiki h2 {margin-left: 0px; margin-right: 20px;} -div.dokuwiki h3 {margin-left: 0px; margin-right: 40px;} -div.dokuwiki h4 {margin-left: 0px; margin-right: 60px;} -div.dokuwiki h5 {margin-left: 0px; margin-right: 80px;} -/* indent different sections */ -div.dokuwiki div.level1 {margin-left: 0px; margin-right: 3px;} -div.dokuwiki div.level2 {margin-left: 0px; margin-right: 23px;} -div.dokuwiki div.level3 {margin-left: 0px; margin-right: 43px;} -div.dokuwiki div.level4 {margin-left: 0px; margin-right: 63px;} -div.dokuwiki div.level5 {margin-left: 0px; margin-right: 83px;} +/*____________ _diff ____________*/ -/* TOC control */ -div.dokuwiki div.toc { - float: left; + +/*____________ _edit ____________*/ + +.dokuwiki div.toolbar #draft__status { + float: left; +} +.dokuwiki #wiki__editbar #size__ctl { + float: left; +} +.dokuwiki #wiki__editbar #size__ctl img { + cursor: pointer; +} +.dokuwiki #wiki__editbar .editButtons { + margin-right: 0; + margin-left: 1em; } -div.dokuwiki div.tocheader { - text-align: right; +.dokuwiki .secedit { + float: left; } -div.dokuwiki #toc__inside { - text-align: right; + +/*____________ _modal ____________*/ + +#link__wiz_close { + float: left; +} +#link__wiz_result { + text-align: right; } +#link__wiz_result div.type_u, +#link__wiz_result div.type_f, +#link__wiz_result div.type_d { + padding: 3px 22px 3px 3px; + background-position: 257px 3px; +} + -div.dokuwiki ul.toc { - padding: 0; - padding-right: 1em; +/*____________ _forms ____________*/ + +.dokuwiki label.block { + text-align: left; +} +.dokuwiki label.simple { + text-align: right; } -div.dokuwiki ul.toc li { - background-position: right 0.6em; - padding-right:0.4em; - direction: rtl; +form#subscribe__form fieldset { + text-align: right; } -div.dokuwiki ul.toc li.clear { - padding-right:0.4em; + +/*____________ _admin ____________*/ + +.dokuwiki ul.admin_tasks { + float: right; +} +.dokuwiki ul.admin_tasks li { + padding-left: 0; + padding-right: 35px; + background-position: right 0; } -div.dokuwiki pre { - text-align: left; +.dokuwiki #admin__version { + clear: right; + float: left; } + +/*____________ includes ____________*/ + + diff --git a/style.ini b/style.ini index 9a16508..9dfbb3c 100644 --- a/style.ini +++ b/style.ini @@ -24,9 +24,9 @@ css/_edit.css = screen css/_modal.css = screen css/_forms.css = screen css/_admin.css = screen -;css/includes.css = screen +css/includes.css = screen -;css/rtl.css = rtl +css/rtl.css = rtl ;css/print.css = print