summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnika Henke <anika@selfthinker.org>2012-01-14 17:50:11 +0000
committerAnika Henke <anika@selfthinker.org>2012-01-14 17:50:11 +0000
commitd77336836c77fffcc32660e410a948ee19d74d16 (patch)
tree07573bbae1c55a0146a0578c1e8c6225f74a422d
parent97db95bfee88e5f762c760daec7aee233254a98c (diff)
downloadrpg-d77336836c77fffcc32660e410a948ee19d74d16.tar.gz
rpg-d77336836c77fffcc32660e410a948ee19d74d16.tar.bz2
made CSS coding style more consistent (pure whitespace changes)
-rwxr-xr-xcss/basic.css87
-rwxr-xr-xcss/content.css15
-rwxr-xr-xcss/design.css49
3 files changed, 103 insertions, 48 deletions
diff --git a/css/basic.css b/css/basic.css
index 08f498acc..0165a55ff 100755
--- a/css/basic.css
+++ b/css/basic.css
@@ -12,7 +12,8 @@ html {
overflow-x: auto;
overflow-y: scroll;
}
-html, body {
+html,
+body {
/* @todo: style.ini for #fbfaf9?!? */
background-color: #fbfaf9;
color: __text__;
@@ -34,8 +35,14 @@ body {
/*____________ headers ____________*/
-h1, h2, h3, h4, h5, h6,
-caption, legend {
+h1,
+h2,
+h3,
+h4,
+h5,
+h6,
+caption,
+legend {
font-family: Arial, sans-serif;
font-weight: bold;
background-color: inherit;
@@ -84,8 +91,16 @@ h6 {
/*____________ 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;
}
@@ -95,16 +110,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;
}
@@ -114,8 +128,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;
}
@@ -146,7 +164,8 @@ caption {
margin: 0 0 .3em;
}
-th, td {
+th,
+td {
padding: .3em .5em;
margin: 0;
vertical-align: top;
@@ -163,19 +182,25 @@ th {
a {
}
-a:link, a:visited {
+a:link,
+a:visited {
text-decoration: none;
color: __link__; /* §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 */
}
@@ -189,7 +214,8 @@ img {
background-color: transparent;
font-style: italic;
}
-img, object {
+img,
+object {
max-width: 100%;
}
@@ -203,13 +229,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;
@@ -226,11 +256,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;
}
@@ -329,10 +361,3 @@ button,
cursor: pointer;
}
-/*____________ general classes ____________*/
-
-div.clearer {
- /* additional to what's already in lib/styles/all.css: */
- font-size: 1px;
- visibility: hidden;
-}
diff --git a/css/content.css b/css/content.css
index 376c6f6dd..d908be6b4 100755
--- a/css/content.css
+++ b/css/content.css
@@ -26,10 +26,17 @@
/*____________ images ____________*/
/* embedded images (styles are already partly set in 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 fba6572fa..c3f235674 100755
--- a/css/design.css
+++ b/css/design.css
@@ -377,22 +377,43 @@
/* make sidebar more condensed */
/* make h1 in sidebar ugly and small to prevent people using it */
-#dokuwiki__aside h1 { font-size: .7em; color: green; background-color: pink; }
-#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 {
+ font-size: .7em;
+ color: green;
+ background-color: pink;
+}
+#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;
}
@@ -454,8 +475,10 @@
font-size: 100%;
}
-#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;
}