From 2ba9f431b90f359b7fb95b25d2b8267157fd7996 Mon Sep 17 00:00:00 2001 From: Andreas Haerter Date: Sat, 23 Oct 2010 16:44:39 +0200 Subject: Typos --- lib/tpl/default/media.css | 2 +- lib/tpl/default/rtl.css | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/tpl/default') diff --git a/lib/tpl/default/media.css b/lib/tpl/default/media.css index 2831c984f..d412fd9cf 100644 --- a/lib/tpl/default/media.css +++ b/lib/tpl/default/media.css @@ -1,5 +1,5 @@ /** - * The CSS in here cotrols the appearance of the media manager + * The CSS in here controls the appearance of the media manager */ #media__manager { diff --git a/lib/tpl/default/rtl.css b/lib/tpl/default/rtl.css index 6c2d1fbd2..f66a670e0 100644 --- a/lib/tpl/default/rtl.css +++ b/lib/tpl/default/rtl.css @@ -1,5 +1,5 @@ /** - * Layout and dedsign corrections for right-to-left languages + * Layout and design corrections for right-to-left languages * * @author Andreas Gohr * @author Dotan Kamber -- cgit v1.2.3 From 317d85c9da899f7720469b4831116604488ba503 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Fri, 5 Nov 2010 10:23:20 +0100 Subject: style fixes for RTL languages FS#2089 --- lib/tpl/default/rtl.css | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'lib/tpl/default') diff --git a/lib/tpl/default/rtl.css b/lib/tpl/default/rtl.css index f66a670e0..e40dd966d 100644 --- a/lib/tpl/default/rtl.css +++ b/lib/tpl/default/rtl.css @@ -145,3 +145,11 @@ div.dokuwiki blockquote { text-align: right; } +/* Search corrections */ +div.dokuwiki ul.search_quickhits li { + float: right; +} + +div#qsearch__out { + text-align: right; +} -- cgit v1.2.3 From 8cf5aee5bbf192bf6408088a6d2f497a2087105d Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sun, 7 Nov 2010 21:17:02 +0000 Subject: added missing styles to print.css (underline, centered images and clearer) --- lib/tpl/default/print.css | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'lib/tpl/default') diff --git a/lib/tpl/default/print.css b/lib/tpl/default/print.css index 60c172585..15c6dad29 100644 --- a/lib/tpl/default/print.css +++ b/lib/tpl/default/print.css @@ -43,6 +43,14 @@ div.secedit { display: none; } +div.clearer { + clear: both; + line-height: 0; + height: 0; + overflow: hidden; +} + + /* --------------------- Text formating -------------------------------- */ /* external link */ @@ -114,6 +122,21 @@ img.mediaright { margin: 0 0 0 1.5em; } +img.mediacenter { + display: block; + margin-left: auto; + margin-right: auto; +} + +/* underline */ +em.u { + font-style: normal; + text-decoration: underline; +} +em em.u { + font-style: italic; +} + /* unordered lists */ ul { line-height: 1.5em; -- cgit v1.2.3 From afca7e7eb41bc692ca11c4fb80f32c860e2bd3d5 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Fri, 12 Nov 2010 20:34:00 +0100 Subject: FS#1839: take favicon from mediadir (if it exists) --- lib/tpl/default/main.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/tpl/default') diff --git a/lib/tpl/default/main.php b/lib/tpl/default/main.php index d9231678b..754a6e482 100644 --- a/lib/tpl/default/main.php +++ b/lib/tpl/default/main.php @@ -29,7 +29,7 @@ if (!defined('DOKU_INC')) die(); - + -- cgit v1.2.3 From ebb29737d32bc331541f78a1a47f33ba33919938 Mon Sep 17 00:00:00 2001 From: Dominik Eckelmann Date: Sat, 13 Nov 2010 13:59:17 +0100 Subject: fixed mediamanager options + ie6 fix (FS#2074) --- lib/tpl/default/_mediaoptions.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/tpl/default') diff --git a/lib/tpl/default/_mediaoptions.css b/lib/tpl/default/_mediaoptions.css index 7ac489929..19e2c4853 100644 --- a/lib/tpl/default/_mediaoptions.css +++ b/lib/tpl/default/_mediaoptions.css @@ -5,7 +5,7 @@ display:none; border: 1px solid __border__; position: absolute; - width:270px; + width:280px; } #media__popup h1 { -- cgit v1.2.3 From 4871414204799044c31aa2764c4b4ca020e2331d Mon Sep 17 00:00:00 2001 From: Michael Hamann Date: Fri, 26 Nov 2010 16:54:51 +0100 Subject: Fix for $conf['breadcrumbs'] < 0, FS#2107 This fixes an infinite loop in breadcrumbs() and makes the behaviors in all places where breadcrumbs are used consistent so that non-numeric values, values < 0 and 0 are treated the same way. --- lib/tpl/default/main.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/tpl/default') diff --git a/lib/tpl/default/main.php b/lib/tpl/default/main.php index 754a6e482..c1b62f12e 100644 --- a/lib/tpl/default/main.php +++ b/lib/tpl/default/main.php @@ -68,7 +68,7 @@ if (!defined('DOKU_INC')) die();
- + 0){?>
-- cgit v1.2.3 From 359fab8b2f7d0847ef0cf9b669e6c8ffb0687525 Mon Sep 17 00:00:00 2001 From: Michael Hamann Date: Tue, 30 Nov 2010 18:34:10 +0100 Subject: Revert "Fix for $conf['breadcrumbs'] < 0, FS#2107", new fix This reverts commit 4871414204799044c31aa2764c4b4ca020e2331d. Additionally there is a new fix for FS#2107 that doesn't introduce a lot of checks but instead ensures that the configuration option can't be set to negative values when the configuration manager is used. --- lib/tpl/default/main.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/tpl/default') diff --git a/lib/tpl/default/main.php b/lib/tpl/default/main.php index c1b62f12e..754a6e482 100644 --- a/lib/tpl/default/main.php +++ b/lib/tpl/default/main.php @@ -68,7 +68,7 @@ if (!defined('DOKU_INC')) die();
- 0){?> +
-- cgit v1.2.3 From be96545ccf297b7b2a7bf10b2d0f35d636e8adf6 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Mon, 3 Jan 2011 15:46:10 +0000 Subject: removed obsolete references to 'JSnocheck' class --- lib/tpl/default/rtl.css | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'lib/tpl/default') diff --git a/lib/tpl/default/rtl.css b/lib/tpl/default/rtl.css index e40dd966d..82c85839b 100644 --- a/lib/tpl/default/rtl.css +++ b/lib/tpl/default/rtl.css @@ -55,8 +55,7 @@ div.dokuwiki li ol { div.dokuwiki a.urlextern, div.dokuwiki a.interwiki, div.dokuwiki a.windows, -div.dokuwiki a.mail, -div.dokuwiki a.mail.JSnocheck { +div.dokuwiki a.mail { /* should work but doesn't - so we just disable icons here*/ /* background-position: right 1px; -- cgit v1.2.3 From 7216538165621816dc3f751adc0746bf66805421 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Mon, 31 Jan 2011 14:00:32 +0100 Subject: Make diff type selectable --- lib/tpl/default/design.css | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'lib/tpl/default') diff --git a/lib/tpl/default/design.css b/lib/tpl/default/design.css index 09a9ecf01..42f9f622e 100644 --- a/lib/tpl/default/design.css +++ b/lib/tpl/default/design.css @@ -652,10 +652,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 { -- cgit v1.2.3 From 0993d1c5d3a1738d8aeef80d1d03d3189f5ca858 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sun, 6 Feb 2011 16:13:14 +0000 Subject: FS#2067: fixed monospace font sizes --- lib/tpl/default/design.css | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) (limited to 'lib/tpl/default') diff --git a/lib/tpl/default/design.css b/lib/tpl/default/design.css index 42f9f622e..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__; -- cgit v1.2.3 From 449095130497f47d1f9ec3f67d70d2eb1c99446e Mon Sep 17 00:00:00 2001 From: Petsagourakis George Date: Fri, 18 Feb 2011 19:49:08 +0200 Subject: Passed every png file through http://www.smushit.com/ysmush.it/ saving some 1-2kb of binary image data --- lib/tpl/default/images/UWEB.png | Bin 1138 -> 1065 bytes lib/tpl/default/images/UWEBshadow.png | Bin 1123 -> 900 bytes lib/tpl/default/images/button-dw.png | Bin 427 -> 404 bytes lib/tpl/default/images/button-rss.png | Bin 280 -> 196 bytes lib/tpl/default/images/buttonshadow.png | Bin 257 -> 218 bytes lib/tpl/default/images/inputshadow.png | Bin 155 -> 93 bytes 6 files changed, 0 insertions(+), 0 deletions(-) (limited to 'lib/tpl/default') diff --git a/lib/tpl/default/images/UWEB.png b/lib/tpl/default/images/UWEB.png index ea03aec94..bded2c76f 100644 Binary files a/lib/tpl/default/images/UWEB.png and b/lib/tpl/default/images/UWEB.png differ diff --git a/lib/tpl/default/images/UWEBshadow.png b/lib/tpl/default/images/UWEBshadow.png index 212444f0e..8c4e5f829 100644 Binary files a/lib/tpl/default/images/UWEBshadow.png and b/lib/tpl/default/images/UWEBshadow.png differ diff --git a/lib/tpl/default/images/button-dw.png b/lib/tpl/default/images/button-dw.png index 39d5f56a9..97272d968 100644 Binary files a/lib/tpl/default/images/button-dw.png and b/lib/tpl/default/images/button-dw.png differ diff --git a/lib/tpl/default/images/button-rss.png b/lib/tpl/default/images/button-rss.png index b036f7152..0a55642ef 100644 Binary files a/lib/tpl/default/images/button-rss.png and b/lib/tpl/default/images/button-rss.png differ diff --git a/lib/tpl/default/images/buttonshadow.png b/lib/tpl/default/images/buttonshadow.png index f60be309f..b96ebf759 100644 Binary files a/lib/tpl/default/images/buttonshadow.png and b/lib/tpl/default/images/buttonshadow.png differ diff --git a/lib/tpl/default/images/inputshadow.png b/lib/tpl/default/images/inputshadow.png index d286beb22..480044986 100644 Binary files a/lib/tpl/default/images/inputshadow.png and b/lib/tpl/default/images/inputshadow.png differ -- cgit v1.2.3 From 383396f405a7c29f52175fdd71ca5b630533160e Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sun, 27 Feb 2011 10:50:12 +0000 Subject: deleted template print styles which are now in the core styles --- lib/tpl/default/print.css | 47 +++-------------------------------------------- 1 file changed, 3 insertions(+), 44 deletions(-) (limited to 'lib/tpl/default') diff --git a/lib/tpl/default/print.css b/lib/tpl/default/print.css index 15c6dad29..45b60aad2 100644 --- a/lib/tpl/default/print.css +++ b/lib/tpl/default/print.css @@ -33,23 +33,10 @@ div.meta { text-align: right; } - -div.notify, -div.info, -div.success, -div.error, -div.breadcrumbs, -div.secedit { +div.breadcrumbs { display: none; } -div.clearer { - clear: both; - line-height: 0; - height: 0; - overflow: hidden; -} - /* --------------------- Text formating -------------------------------- */ @@ -110,31 +97,15 @@ img.media { margin: 3px; } +/* the styles for media images are already in + lib/styles/all.css, these are additional styles */ img.medialeft { - border: 0; - float: left; margin: 0 1.5em 0 0; } - img.mediaright { - border: 0; - float: right; margin: 0 0 0 1.5em; } - img.mediacenter { - display: block; - margin-left: auto; - margin-right: auto; -} - -/* underline */ -em.u { - font-style: normal; - text-decoration: underline; -} -em em.u { - font-style: italic; } /* unordered lists */ @@ -253,17 +224,5 @@ table.inline td { border: 1px solid #000000; } -.leftalign { - text-align: left; -} - -.centeralign { - text-align: center; -} - -.rightalign { - text-align: right; -} - .toc, .footerinc, .header, .bar, .user { display: none; } -- cgit v1.2.3