diff --git a/css/basic.css b/css/basic.css index 5bff62d..0679920 100644 --- a/css/basic.css +++ b/css/basic.css @@ -12,7 +12,8 @@ html { overflow-x: auto; overflow-y: scroll; } -html, body { +html, +body { background-color: __background__; color: __text__; margin: 0; @@ -26,8 +27,14 @@ body { /*____________ headers ____________*/ -h1, h2, h3, h4, h5, h6, -caption, legend { +h1, +h2, +h3, +h4, +h5, +h6, +caption, +legend { font-family: Constantia, Utopia, Lucidabright, Lucida, Georgia, "Nimbus Roman No9 L", serif; font-weight: bold; color: __text_neu__; @@ -37,19 +44,45 @@ caption, legend { clear: left; /* ideally 'both', but problems with toc */ } -h1 { font-size: 2.25em; margin: 0 0 0.444em; } -h2 { font-size: 1.5em; margin: 0 0 0.666em; } -h3 { font-size: 1.125em; margin: 0 0 0.888em; } -h4 { font-size: 1em; margin: 0 0 1.0em; } -h5 { font-size: .875em; margin: 0 0 1.1428em; } -h6 { font-size: .75em; margin: 0 0 1.333em; } +h1 { + font-size: 2.25em; + margin: 0 0 0.444em; +} +h2 { + font-size: 1.5em; + margin: 0 0 0.666em; +} +h3 { + font-size: 1.125em; + margin: 0 0 0.888em; +} +h4 { + font-size: 1em; + margin: 0 0 1.0em; +} +h5 { + font-size: .875em; + margin: 0 0 1.1428em; +} +h6 { + font-size: .75em; + margin: 0 0 1.333em; +} /* bottom margin = 1 / font-size */ /*____________ basic margins and paddings ____________*/ -p, ul, ol, dl, pre, table, -hr, blockquote, fieldset, address { +p, +ul, +ol, +dl, +pre, +table, +hr, +blockquote, +fieldset, +address { margin: 0 0 1.4em 0; /* bottom margin = line-height */ padding: 0; } @@ -59,16 +92,15 @@ div { padding: 0; } -p, dt, dd, td, th, li { -} - /*____________ lists ____________*/ -ul, ol { +ul, +ol { padding: 0 0 0 1.5em; } -li, dd { +li, +dd { padding: 0; margin: 0 0 0 1.5em; } @@ -78,8 +110,12 @@ dt { padding: 0; } -li ul, li ol, li dl, -dl ul, dl ol, dl dl { +li ul, +li ol, +li dl, +dl ul, +dl ol, +dl dl { margin-bottom: 0; padding: 0; } @@ -87,12 +123,24 @@ li li { font-size: 100%; } -ul { list-style: disc outside; } -ol { list-style: decimal outside; } -ol ol { list-style-type: lower-alpha; } -ol ol ol { list-style-type: upper-roman; } -ol ol ol ol { list-style-type: upper-alpha; } -ol ol ol ol ol { list-style-type: lower-roman; } +ul { + list-style: disc outside; +} +ol { + list-style: decimal outside; +} +ol ol { + list-style-type: lower-alpha; +} +ol ol ol { + list-style-type: upper-roman; +} +ol ol ol ol { + list-style-type: upper-alpha; +} +ol ol ol ol ol { + list-style-type: lower-roman; +} /*____________ tables ____________*/ @@ -110,7 +158,8 @@ caption { margin: 0 0 .3em; } -th, td { +th, +td { padding: .3em .5em; margin: 0; vertical-align: top; @@ -127,19 +176,25 @@ th { a { } -a:link, a:visited { +a:link, +a:visited { text-decoration: none; color: #00c; /* §colour */ } -a:link:hover, a:visited:hover, -a:link:focus, a:visited:focus, -a:link:active, a:visited:active { +a:link:hover, +a:visited:hover, +a:link:focus, +a:visited:focus, +a:link:active, +a:visited:active { text-decoration: underline; } -a:link:focus, a:visited:focus { +a:link:focus, +a:visited:focus { outline: 1px dotted; } -a:link:active, a:visited:active { +a:link:active, +a:visited:active { color: #c00; /* §colour */ } @@ -154,7 +209,8 @@ img { font-style: italic; } -img, object { +img, +object { max-width: 100%; } @@ -167,13 +223,17 @@ hr { clear: both; } -acronym, abbr { +acronym, +abbr { cursor: help; border-bottom: 1px dotted; font-style: normal; } -pre, code, samp, kbd { +pre, +code, +samp, +kbd { font-family: Consolas, "Andale Mono WT", "Andale Mono", "Bitstream Vera Sans Mono", "Nimbus Mono L", Monaco, "Courier New", monospace; /* same font stack should be used for ".dokuwiki table.diff td" in _diff.css */ font-size: 1em; @@ -190,11 +250,13 @@ blockquote { border: solid __border__; border-width: 0 0 0 .25em; } -q:before, q:after { +q:before, +q:after { content: ''; } -sub, sup { +sub, +sup { font-size: .8em; line-height: 1; } @@ -224,8 +286,12 @@ label { vertical-align: middle; cursor: pointer; } -input, textarea, button, -select, optgroup, option { +input, +textarea, +button, +select, +optgroup, +option { font: inherit; color: inherit; /* background-color destroys button look */ @@ -233,21 +299,35 @@ select, optgroup, option { margin: 0; vertical-align: middle; } -input[type=text], input[type=password], textarea { +input[type=text], +input[type=password], +textarea { padding: .1em; } -input[type=radio], input[type=checkbox], input.check { +input[type=radio], +input[type=checkbox], +input.check { padding: 0; } -input[type=submit], input.button, button { +input[type=submit], +input.button, +button { cursor: pointer; } -input[disabled], button[disabled], -input[readonly], button[readonly] { +input[disabled], +button[disabled], +input[readonly], +button[readonly] { cursor: auto; } -optgroup { font-style: italic; font-weight: bold; } -option { font-style: normal; font-weight: normal; } +optgroup { + font-style: italic; + font-weight: bold; +} +option { + font-style: normal; + font-weight: normal; +} /*____________ general classes ____________*/ diff --git a/css/content.css b/css/content.css index c3b15e5..dddeae0 100644 --- a/css/content.css +++ b/css/content.css @@ -8,16 +8,36 @@ /*____________ section indenting ____________ -.dokuwiki.page h1 {margin-left: 0;} -.dokuwiki.page h2 {margin-left: .666em;} -.dokuwiki.page h3 {margin-left: 1.776em;} -.dokuwiki.page h4 {margin-left: 3em;} -.dokuwiki.page h5 {margin-left: 4.5712em;} -.dokuwiki.page div.level1 {margin-left: 0;} -.dokuwiki.page div.level2 {margin-left: 1em;} -.dokuwiki.page div.level3 {margin-left: 2em;} -.dokuwiki.page div.level4 {margin-left: 3em;} -.dokuwiki.page div.level5 {margin-left: 4em;} +.dokuwiki.page h1 { + margin-left: 0; +} +.dokuwiki.page div.level1 { + margin-left: 0; +} +.dokuwiki.page h2 { + margin-left: .666em; +} +.dokuwiki.page div.level2 { + margin-left: 1em; +} +.dokuwiki.page h3 { + margin-left: 1.776em; +} +.dokuwiki.page div.level3 { + margin-left: 2em; +} +.dokuwiki.page h4 { + margin-left: 3em; +} +.dokuwiki.page div.level4 { + margin-left: 3em; +} +.dokuwiki.page h5 { + margin-left: 4.5712em; +} +.dokuwiki.page div.level5 { + margin-left: 4em; +} */ /* hx margin-left = (1 / font-size) * .levelx-margin */ @@ -25,10 +45,17 @@ /*____________ images ____________*/ /* embedded images (styles are already partly set in DokuWiki's lib/styles/all.css) */ -.dokuwiki img.media { } -.dokuwiki img.medialeft { margin: .5em 1.5em .5em 0; } -.dokuwiki img.mediaright { margin: .5em 0 .5em 1.5em; } -.dokuwiki img.mediacenter { margin: .5em auto; } +.dokuwiki img.media { +} +.dokuwiki img.medialeft { + margin: .5em 1.5em .5em 0; +} +.dokuwiki img.mediaright { + margin: .5em 0 .5em 1.5em; +} +.dokuwiki img.mediacenter { + margin: .5em auto; +} /*____________ tables ____________*/ diff --git a/css/design.css b/css/design.css index 2e13dd0..fbbd198 100644 --- a/css/design.css +++ b/css/design.css @@ -171,22 +171,41 @@ /* make sidebar more condensed */ -#dokuwiki__aside h1 { margin-bottom: .222em; } -#dokuwiki__aside h2 { margin-bottom: .333em; } -#dokuwiki__aside h3 { margin-bottom: .444em; } -#dokuwiki__aside h4 { margin-bottom: .5em; } -#dokuwiki__aside h5 { margin-bottom: .5714em; } - -#dokuwiki__aside p, #dokuwiki__aside ul, #dokuwiki__aside ol, #dokuwiki__aside dl, -#dokuwiki__aside pre, #dokuwiki__aside table, #dokuwiki__aside fieldset, -#dokuwiki__aside hr, #dokuwiki__aside blockquote, #dokuwiki__aside address { +#dokuwiki__aside h1 { + margin-bottom: .222em; +} +#dokuwiki__aside h2 { + margin-bottom: .333em; +} +#dokuwiki__aside h3 { + margin-bottom: .444em; +} +#dokuwiki__aside h4 { + margin-bottom: .5em; +} +#dokuwiki__aside h5 { + margin-bottom: .5714em; +} + +#dokuwiki__aside p, +#dokuwiki__aside ul, +#dokuwiki__aside ol, +#dokuwiki__aside dl, +#dokuwiki__aside pre, +#dokuwiki__aside table, +#dokuwiki__aside fieldset, +#dokuwiki__aside hr, +#dokuwiki__aside blockquote, +#dokuwiki__aside address { margin-bottom: .7em; } -#dokuwiki__aside ul, #dokuwiki__aside ol { +#dokuwiki__aside ul, +#dokuwiki__aside ol { padding-left: 0; } -#dokuwiki__aside li ul, #dokuwiki__aside li ol { +#dokuwiki__aside li ul, +#dokuwiki__aside li ol { margin-bottom: 0; } @@ -211,8 +230,10 @@ font-size: 93.75%; } -#IE6 .dokuwiki input.button, #IE6 .dokuwiki button, -#IE7 .dokuwiki input.button, #IE7 .dokuwiki button { +#IE6 .dokuwiki input.button, +#IE6 .dokuwiki button, +#IE7 .dokuwiki input.button, +#IE7 .dokuwiki button { line-height: 1.4; } diff --git a/css/print.css b/css/print.css index 9171bc9..ebb5a2a 100644 --- a/css/print.css +++ b/css/print.css @@ -21,19 +21,38 @@ div.notify, div.info, div.success, div.error, display: none; } -.dokuwiki h1, .dokuwiki h2, .dokuwiki h3, .dokuwiki h4, .dokuwiki h5, -.dokuwiki caption, .dokuwiki legend { +.dokuwiki h1, +.dokuwiki h2, +.dokuwiki h3, +.dokuwiki h4, +.dokuwiki h5, +.dokuwiki caption, +.dokuwiki legend { clear: both; } -.dokuwiki ul { list-style: disc outside; } -.dokuwiki ol { list-style: decimal outside; } -.dokuwiki ol ol { list-style-type: lower-alpha; } -.dokuwiki ol ol ol { list-style-type: upper-roman; } -.dokuwiki ol ol ol ol { list-style-type: upper-alpha; } -.dokuwiki ol ol ol ol ol { list-style-type: lower-roman; } + +.dokuwiki ul { + list-style: disc outside; +} +.dokuwiki ol { + list-style: decimal outside; +} +.dokuwiki ol ol { + list-style-type: lower-alpha; +} +.dokuwiki ol ol ol { + list-style-type: upper-roman; +} +.dokuwiki ol ol ol ol { + list-style-type: upper-alpha; +} +.dokuwiki ol ol ol ol ol { + list-style-type: lower-roman; +} /* undo icons */ -.dokuwiki a:link, .dokuwiki a:visited { +.dokuwiki a:link, +.dokuwiki a:visited { text-decoration: underline; color: #333; background-color: inherit; @@ -53,24 +72,48 @@ a.mail:after { .dokuwiki pre { font-family: monospace; } -.dokuwiki dl.code dt, .dokuwiki dl.file dt { +.dokuwiki dl.code dt, +.dokuwiki dl.file dt { font-weight: bold; } /* images */ -.dokuwiki img { border-width: 0; vertical-align: middle; } -.dokuwiki img.medialeft { margin: .5em 1.5em .5em 0; float: left; } -.dokuwiki img.mediaright { margin: .5em 0 .5em 1.5em; float: right; } -.dokuwiki img.mediacenter { margin: .5em auto; display: block; } +.dokuwiki img { + border-width: 0; + vertical-align: middle; +} +.dokuwiki img.medialeft { + margin: .5em 1.5em .5em 0; + float: left; +} +.dokuwiki img.mediaright { + margin: .5em 0 .5em 1.5em; + float: right; +} +.dokuwiki img.mediacenter { + margin: .5em auto; + display: block; +} /* align table cells */ -.dokuwiki .leftalign { text-align: left; } -.dokuwiki .centeralign { text-align: center; } -.dokuwiki .rightalign { text-align: right; } +.dokuwiki .leftalign { + text-align: left; +} +.dokuwiki .centeralign { + text-align: center; +} +.dokuwiki .rightalign { + text-align: right; +} /* underline */ -.dokuwiki em.u { font-style: normal; text-decoration: underline; } -.dokuwiki em em.u { font-style: italic; } +.dokuwiki em.u { + font-style: normal; + text-decoration: underline; +} +.dokuwiki em em.u { + font-style: italic; +} div.clearer { clear: both; @@ -93,7 +136,8 @@ div.clearer { border-spacing: 0; border: 1pt solid #ccc; } -.dokuwiki th, .dokuwiki td { +.dokuwiki th, +.dokuwiki td { padding: 3pt 5pt; margin: 0; vertical-align: top; diff --git a/css/rtl.css b/css/rtl.css index 1164c0e..ed97d53 100644 --- a/css/rtl.css +++ b/css/rtl.css @@ -13,18 +13,26 @@ th { text-align: right; } -ul, ol { +ul, +ol { padding: 0 1.5em 0 0; } -li, dd { +li, +dd { margin: 0 1.5em 0 0; } blockquote { border-width: 0 .25em 0 0; } -h1, h2, h3, h4, h5, h6, -caption, legend { +h1, +h2, +h3, +h4, +h5, +h6, +caption, +legend { clear: right; } @@ -82,16 +90,46 @@ caption, legend { /*____________ content ____________*/ /* section indenting -.dokuwiki .page h1 {margin-left: 0; margin-right: 0;} -.dokuwiki .page h2 {margin-left: 0; margin-right: .666em;} -.dokuwiki .page h3 {margin-left: 0; margin-right: 1.776em;} -.dokuwiki .page h4 {margin-left: 0; margin-right: 3em;} -.dokuwiki .page h5 {margin-left: 0; margin-right: 4.5712em;} -.dokuwiki .page div.level1 {margin-left: 0; margin-right: 0;} -.dokuwiki .page div.level2 {margin-left: 0; margin-right: 1em;} -.dokuwiki .page div.level3 {margin-left: 0; margin-right: 2em;} -.dokuwiki .page div.level4 {margin-left: 0; margin-right: 3em;} -.dokuwiki .page div.level5 {margin-left: 0; margin-right: 4em;} +.dokuwiki .page h1 { + margin-left: 0; + margin-right: 0; +} +.dokuwiki .page div.level1 { + margin-left: 0; + margin-right: 0; +} +.dokuwiki .page h2 { + margin-left: 0; + margin-right: .666em; +} +.dokuwiki .page div.level2 { + margin-left: 0; + margin-right: 1em; +} +.dokuwiki .page h3 { + margin-left: 0; + margin-right: 1.776em; +} +.dokuwiki .page div.level3 { + margin-left: 0; + margin-right: 2em; +} +.dokuwiki .page h4 { + margin-left: 0; + margin-right: 3em; +} +.dokuwiki .page div.level4 { + margin-left: 0; + margin-right: 3em; +} +.dokuwiki .page h5 { + margin-left: 0; + margin-right: 4.5712em; +} +.dokuwiki .page div.level5 { + margin-left: 0; + margin-right: 4em; +} */ .dokuwiki dl.code dt,