diff options
| author | Michael Hamann <michael@content-space.de> | 2011-02-24 23:27:24 +0100 |
|---|---|---|
| committer | Michael Hamann <michael@content-space.de> | 2011-02-24 23:27:24 +0100 |
| commit | f77fc90de1e477b721442757cd7413f91cccc044 (patch) | |
| tree | 2abb734dacf39419b96b6b70c65115de57228fc3 /lib/tpl | |
| parent | b8c040db1fdc0eee80963e57d95a15fd3813912d (diff) | |
| parent | bd07158f0f2569ae470f980dd49d69b7f1fd2c49 (diff) | |
| download | rpg-f77fc90de1e477b721442757cd7413f91cccc044.tar.gz rpg-f77fc90de1e477b721442757cd7413f91cccc044.tar.bz2 | |
Merge branch 'master' into indexer_rewrite
Conflicts:
inc/fulltext.php
inc/indexer.php
lib/exe/indexer.php
Diffstat (limited to 'lib/tpl')
| -rw-r--r-- | lib/tpl/default/design.css | 26 | ||||
| -rw-r--r-- | lib/tpl/default/images/UWEB.png | bin | 1138 -> 1065 bytes | |||
| -rw-r--r-- | lib/tpl/default/images/UWEBshadow.png | bin | 1123 -> 900 bytes | |||
| -rw-r--r-- | lib/tpl/default/images/button-dw.png | bin | 427 -> 404 bytes | |||
| -rw-r--r-- | lib/tpl/default/images/button-rss.png | bin | 280 -> 196 bytes | |||
| -rw-r--r-- | lib/tpl/default/images/buttonshadow.png | bin | 257 -> 218 bytes | |||
| -rw-r--r-- | lib/tpl/default/images/inputshadow.png | bin | 155 -> 93 bytes |
7 files changed, 15 insertions, 11 deletions
diff --git a/lib/tpl/default/design.css b/lib/tpl/default/design.css index 09a9ecf01..1fdf2bfac 100644 --- a/lib/tpl/default/design.css +++ b/lib/tpl/default/design.css @@ -85,8 +85,10 @@ div.dokuwiki fieldset { } div.dokuwiki textarea.edit { - font-family: monospace; - font-size: 14px; + font-family: monospace, serif; + /* second generic font fixes problem with font-size, see + http://meyerweb.com/eric/thoughts/2010/02/12/fixed-monospace-sizing/ */ + font-size: 100%; color: __text__; background-color: __background__; border: 1px solid __border__; @@ -464,9 +466,14 @@ div.dokuwiki blockquote { padding-left: 3px; } +div.dokuwiki pre, +div.dokuwiki code { + font-family: monospace, serif; + /* second generic font fixes problem with font-size, see + http://meyerweb.com/eric/thoughts/2010/02/12/fixed-monospace-sizing/ */ + font-size: 100%; +} div.dokuwiki pre { - font-family: monospace; - font-size: 120%; padding: 0.5em; border: 1px dashed __border__; color: __text__; @@ -519,11 +526,6 @@ div.dokuwiki dl.file dt { } -/* inline code words */ -div.dokuwiki code { - font-size: 120%; -} - /* inline tables */ div.dokuwiki table.inline { background-color: __background__; @@ -652,10 +654,12 @@ div.dokuwiki table.diff td { font-family: monospace; font-size: 100%; } -div.dokuwiki td.diff-addedline { +div.dokuwiki td.diff-addedline, +div.dokuwiki span.diff-addedline { background-color: #ddffdd; } -div.dokuwiki td.diff-deletedline { +div.dokuwiki td.diff-deletedline, +div.dokuwiki span.diff-deletedline { background-color: #ffffbb; } div.dokuwiki td.diff-context { diff --git a/lib/tpl/default/images/UWEB.png b/lib/tpl/default/images/UWEB.png Binary files differindex ea03aec94..bded2c76f 100644 --- a/lib/tpl/default/images/UWEB.png +++ b/lib/tpl/default/images/UWEB.png diff --git a/lib/tpl/default/images/UWEBshadow.png b/lib/tpl/default/images/UWEBshadow.png Binary files differindex 212444f0e..8c4e5f829 100644 --- a/lib/tpl/default/images/UWEBshadow.png +++ b/lib/tpl/default/images/UWEBshadow.png diff --git a/lib/tpl/default/images/button-dw.png b/lib/tpl/default/images/button-dw.png Binary files differindex 39d5f56a9..97272d968 100644 --- a/lib/tpl/default/images/button-dw.png +++ b/lib/tpl/default/images/button-dw.png diff --git a/lib/tpl/default/images/button-rss.png b/lib/tpl/default/images/button-rss.png Binary files differindex b036f7152..0a55642ef 100644 --- a/lib/tpl/default/images/button-rss.png +++ b/lib/tpl/default/images/button-rss.png diff --git a/lib/tpl/default/images/buttonshadow.png b/lib/tpl/default/images/buttonshadow.png Binary files differindex f60be309f..b96ebf759 100644 --- a/lib/tpl/default/images/buttonshadow.png +++ b/lib/tpl/default/images/buttonshadow.png diff --git a/lib/tpl/default/images/inputshadow.png b/lib/tpl/default/images/inputshadow.png Binary files differindex d286beb22..480044986 100644 --- a/lib/tpl/default/images/inputshadow.png +++ b/lib/tpl/default/images/inputshadow.png |
