From 1c64eaeaa3295062b0a4e9b20b772274cd86ca42 Mon Sep 17 00:00:00 2001 From: Adrian Lang Date: Wed, 2 Dec 2009 13:24:34 +0100 Subject: Fix section edit highlighting for tables darcs-hash:20091202122434-e4919-d7be5b868af742e2408091b48f0152153ff1acb1.gz --- lib/tpl/default/design.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/tpl/default') diff --git a/lib/tpl/default/design.css b/lib/tpl/default/design.css index 4830a9e2c..2e95abe71 100644 --- a/lib/tpl/default/design.css +++ b/lib/tpl/default/design.css @@ -741,8 +741,8 @@ div.dokuwiki ul.search_quickhits li { width: 30%; } -div.dokuwiki div.section_highlight { - background-color: __background_alt__; +div.dokuwiki .section_highlight { + background-color: __background_alt__ !important; } /* ------------------ Additional ---------------------- */ -- cgit v1.2.3 From 5b75cd1f5c479ada468fbf62a733c54edad152f1 Mon Sep 17 00:00:00 2001 From: Adrian Lang Date: Tue, 5 Jan 2010 14:14:00 +0100 Subject: New mail subscription with digest --- lib/tpl/default/design.css | 14 ++++++++++++++ lib/tpl/default/main.php | 1 - 2 files changed, 14 insertions(+), 1 deletion(-) (limited to 'lib/tpl/default') diff --git a/lib/tpl/default/design.css b/lib/tpl/default/design.css index 4830a9e2c..02804256c 100644 --- a/lib/tpl/default/design.css +++ b/lib/tpl/default/design.css @@ -833,3 +833,17 @@ div.dokuwiki div.imagemeta img.thumb { float: left; margin-right: 0.1em; } + +form#subscribe p { + margin: 0.5em 0; +} + +form#subscribe label { + display:block; + margin: 0 0.5em 0.5em; +} + +form#subscribe fieldset, form#unsubscribe fieldset { + text-align:inherit; + margin: 0; +} diff --git a/lib/tpl/default/main.php b/lib/tpl/default/main.php index 67c3a00ba..b5717c009 100644 --- a/lib/tpl/default/main.php +++ b/lib/tpl/default/main.php @@ -117,7 +117,6 @@ if (!defined('DOKU_INC')) die();
- -- cgit v1.2.3 From 056c20495937fe45fe0f7204b112dbfe6931a855 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Mon, 30 Nov 2009 14:03:11 +0100 Subject: nicer subscription styles Ignore-this: e1b3b815b5ebb0da320bff997c4fed4b darcs-hash:20091130130311-6e07b-03ccfc52abb3dcc0764eed5784d81f8416841328.gz --- lib/tpl/default/_subscription.css | 21 +++++++++++++++++++++ lib/tpl/default/design.css | 13 ------------- lib/tpl/default/style.ini | 7 ++++--- 3 files changed, 25 insertions(+), 16 deletions(-) create mode 100644 lib/tpl/default/_subscription.css (limited to 'lib/tpl/default') diff --git a/lib/tpl/default/_subscription.css b/lib/tpl/default/_subscription.css new file mode 100644 index 000000000..0792c8c21 --- /dev/null +++ b/lib/tpl/default/_subscription.css @@ -0,0 +1,21 @@ +/** + * Styles for the subscription page + */ + +form#subscribe__form { + display: block; + width: 300px; + text-align: center; +} + +form#subscribe__form fieldset { + text-align: left; + margin: 0.5em 0; +} + +form#subscribe__form label { + display:block; + margin: 0 0.5em 0.5em; +} + + diff --git a/lib/tpl/default/design.css b/lib/tpl/default/design.css index 02804256c..9c3e7b119 100644 --- a/lib/tpl/default/design.css +++ b/lib/tpl/default/design.css @@ -834,16 +834,3 @@ div.dokuwiki div.imagemeta img.thumb { margin-right: 0.1em; } -form#subscribe p { - margin: 0.5em 0; -} - -form#subscribe label { - display:block; - margin: 0 0.5em 0.5em; -} - -form#subscribe fieldset, form#unsubscribe fieldset { - text-align:inherit; - margin: 0; -} diff --git a/lib/tpl/default/style.ini b/lib/tpl/default/style.ini index dfd5500fa..84d04e743 100644 --- a/lib/tpl/default/style.ini +++ b/lib/tpl/default/style.ini @@ -10,9 +10,10 @@ layout.css = screen design.css = screen style.css = screen -media.css = screen -_admin.css = screen -_linkwiz.css = screen +media.css = screen +_admin.css = screen +_linkwiz.css = screen +_subscription.css = screen rtl.css = rtl print.css = print -- cgit v1.2.3 From 149e5f262e67264b1612d6c62a67b30341186dd8 Mon Sep 17 00:00:00 2001 From: Dominik Eckelmann Date: Thu, 18 Feb 2010 11:59:28 +0100 Subject: extended mediamanager options --- lib/tpl/default/media.css | 93 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 93 insertions(+) (limited to 'lib/tpl/default') diff --git a/lib/tpl/default/media.css b/lib/tpl/default/media.css index 2831c984f..0bd70db3c 100644 --- a/lib/tpl/default/media.css +++ b/lib/tpl/default/media.css @@ -89,6 +89,99 @@ it's dirty, so any "real" fixes are welcome */ clear: left; } +/* --- popup --- */ + +#media__popup { + background-color:__background__; + display:none; + border: 1px solid __border__; + position: absolute; + width:270px; +} + +#media__popup h1 { + text-align:center; + font-weight:normal; + background-color: __background_alt__; + height: 16px; + margin-bottom: 5px; + font-size:12px; + border-bottom: 0; +} + +#media__popup p { + display:block; + line-height:14pt; + margin:0.5em; +} + +#media_nolink { + padding:4px 0; +} + +#media__popup label { + float:left; + width:9em; +} + +#media__popup .button { + margin-left:auto; + margin-right:auto; +} + +#media__popup .btnlbl { + text-align:center; +} + +#media__popup .btnlbl input { + margin:0 1em; +} + +#media__closeimg { + float:right; +} + +/* --- display options --- */ + +#media__linkopts label, +#media__nolnk { + width: 80px; + float: left; + margin-left: 10px; +} + +#media__linkopts label{ + line-height: 20px; +} + +#media__nolnk, +#media__linkopts label.long{ + margin-bottom: 8px; + line-height: 12px; +} + +#media__linkopts label.long{ + width: 150px; + float: none; +} + +#media__linkopts br { + clear: both; +} + +#media__linkopts select { + width: 60px; + margin-left: 10px; +} + +#media__linkopts input.edit { + width:50px; + margin-left:10px; +} +#media__linkopts #media__title { + width:150px; +} + /* --- file list --- */ #media__content img.load { -- cgit v1.2.3 From 7b63547fc03ef0df23ae8c4bb61e3da41500149b Mon Sep 17 00:00:00 2001 From: Adrian Lang Date: Fri, 19 Feb 2010 14:58:22 +0100 Subject: =?UTF-8?q?Rewrite=20mediamanager=20options=E2=80=99=20JavaScript,?= =?UTF-8?q?=20new=20icons?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/tpl/default/_mediaoptions.css | 92 ++++++++++++++++++++++++++++++++++++++ lib/tpl/default/media.css | 93 --------------------------------------- lib/tpl/default/style.ini | 1 + 3 files changed, 93 insertions(+), 93 deletions(-) create mode 100644 lib/tpl/default/_mediaoptions.css (limited to 'lib/tpl/default') diff --git a/lib/tpl/default/_mediaoptions.css b/lib/tpl/default/_mediaoptions.css new file mode 100644 index 000000000..7ac489929 --- /dev/null +++ b/lib/tpl/default/_mediaoptions.css @@ -0,0 +1,92 @@ +/* --- popup --- */ + +#media__popup { + background-color:__background__; + display:none; + border: 1px solid __border__; + position: absolute; + width:270px; +} + +#media__popup h1 { + text-align:center; + font-weight:normal; + background-color: __background_alt__; + height: 16px; + margin-bottom: 5px; + font-size:12px; + border-bottom: 0; +} + +#media__popup p { + display:block; + line-height:14pt; + margin:0.5em; +} + +#media_nolink { + padding:4px 0; +} + +#media__popup label { + float:left; + width:9em; +} + +#media__popup .button { + margin-left:auto; + margin-right:auto; +} + +#media__popup .btnlbl { + text-align:center; +} + +#media__popup .btnlbl input { + margin:0 1em; +} + +#media__closeimg { + float:right; +} + +/* --- display options --- */ + +#media__linkopts label, +#media__nolnk { + width: 80px; + float: left; + margin-left: 10px; +} + +#media__linkopts label{ + line-height: 20px; +} + +#media__nolnk, +#media__linkopts label.long{ + margin-bottom: 8px; + line-height: 12px; +} + +#media__linkopts label.long{ + width: 150px; + float: none; +} + +#media__linkopts br { + clear: both; +} + +#media__linkopts select { + width: 60px; + margin-left: 10px; +} + +#media__linkopts input.edit { + width:50px; + margin-left:10px; +} +#media__linkopts #media__title { + width:150px; +} diff --git a/lib/tpl/default/media.css b/lib/tpl/default/media.css index 0bd70db3c..2831c984f 100644 --- a/lib/tpl/default/media.css +++ b/lib/tpl/default/media.css @@ -89,99 +89,6 @@ it's dirty, so any "real" fixes are welcome */ clear: left; } -/* --- popup --- */ - -#media__popup { - background-color:__background__; - display:none; - border: 1px solid __border__; - position: absolute; - width:270px; -} - -#media__popup h1 { - text-align:center; - font-weight:normal; - background-color: __background_alt__; - height: 16px; - margin-bottom: 5px; - font-size:12px; - border-bottom: 0; -} - -#media__popup p { - display:block; - line-height:14pt; - margin:0.5em; -} - -#media_nolink { - padding:4px 0; -} - -#media__popup label { - float:left; - width:9em; -} - -#media__popup .button { - margin-left:auto; - margin-right:auto; -} - -#media__popup .btnlbl { - text-align:center; -} - -#media__popup .btnlbl input { - margin:0 1em; -} - -#media__closeimg { - float:right; -} - -/* --- display options --- */ - -#media__linkopts label, -#media__nolnk { - width: 80px; - float: left; - margin-left: 10px; -} - -#media__linkopts label{ - line-height: 20px; -} - -#media__nolnk, -#media__linkopts label.long{ - margin-bottom: 8px; - line-height: 12px; -} - -#media__linkopts label.long{ - width: 150px; - float: none; -} - -#media__linkopts br { - clear: both; -} - -#media__linkopts select { - width: 60px; - margin-left: 10px; -} - -#media__linkopts input.edit { - width:50px; - margin-left:10px; -} -#media__linkopts #media__title { - width:150px; -} - /* --- file list --- */ #media__content img.load { diff --git a/lib/tpl/default/style.ini b/lib/tpl/default/style.ini index 84d04e743..c5b2c31a5 100644 --- a/lib/tpl/default/style.ini +++ b/lib/tpl/default/style.ini @@ -11,6 +11,7 @@ design.css = screen style.css = screen media.css = screen +_mediaoptions.css = screen _admin.css = screen _linkwiz.css = screen _subscription.css = screen -- cgit v1.2.3 From d059ba9bb09b872361eee77c46cbd4aba0042e83 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Fri, 2 Apr 2010 11:34:38 +0200 Subject: Fix gzip compression in combination with buffer flushing FS#1927 This introduces a new function called tpl_flush() which should be used by template authors in favor of the PHP flush() method. --- lib/tpl/default/main.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/tpl/default') diff --git a/lib/tpl/default/main.php b/lib/tpl/default/main.php index b5717c009..d9231678b 100644 --- a/lib/tpl/default/main.php +++ b/lib/tpl/default/main.php @@ -82,7 +82,7 @@ if (!defined('DOKU_INC')) die();
- + @@ -94,7 +94,7 @@ if (!defined('DOKU_INC')) die();
 
- +
-- cgit v1.2.3 From b3389c7a7fa0f2d29f3ab1714d577f9d2194e22d Mon Sep 17 00:00:00 2001 From: Christopher Smith Date: Sat, 10 Apr 2010 15:51:04 +0100 Subject: rtl improvements, plus explicitly specify monospace for pre --- lib/tpl/default/design.css | 1 + lib/tpl/default/print.css | 4 ++++ lib/tpl/default/rtl.css | 7 ++++++- 3 files changed, 11 insertions(+), 1 deletion(-) (limited to 'lib/tpl/default') diff --git a/lib/tpl/default/design.css b/lib/tpl/default/design.css index cd4d03e43..d608e1113 100644 --- a/lib/tpl/default/design.css +++ b/lib/tpl/default/design.css @@ -38,6 +38,7 @@ div.dokuwiki p, div.dokuwiki blockquote, div.dokuwiki table, div.dokuwiki pre { + font-family: monospace; margin: 0 0 1.0em 0; } diff --git a/lib/tpl/default/print.css b/lib/tpl/default/print.css index 1d6e0756f..46a419b35 100644 --- a/lib/tpl/default/print.css +++ b/lib/tpl/default/print.css @@ -143,6 +143,10 @@ span.li { font-weight: normal; } +pre { + font-family: monospace; +} + /* code blocks by indention */ pre.pre { font-size: 8pt; diff --git a/lib/tpl/default/rtl.css b/lib/tpl/default/rtl.css index af3793f7d..4bc41858b 100644 --- a/lib/tpl/default/rtl.css +++ b/lib/tpl/default/rtl.css @@ -45,6 +45,10 @@ div.meta div.doc { div.dokuwiki ul, div.dokuwiki ol { + margin: 0.5em 3.5em 0.5em 0; +} +div.dokuwiki li ul, +div.dokuwiki li ol { margin: 0.5em 1.5em 0.5em 0; } @@ -113,7 +117,8 @@ div.dokuwiki ul.toc li.clear { padding-right: 0.4em; } -div.dokuwiki pre { +div.dokuwiki .code { + direction: ltr; text-align: left; } -- cgit v1.2.3 From fe27e2968d47a4bef11df598c5d6cba87467ceff Mon Sep 17 00:00:00 2001 From: Christopher Smith Date: Sat, 10 Apr 2010 15:53:52 +0100 Subject: fix incorrectly placed explicit font declaration for pre --- lib/tpl/default/design.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/tpl/default') diff --git a/lib/tpl/default/design.css b/lib/tpl/default/design.css index d608e1113..fdc41e55b 100644 --- a/lib/tpl/default/design.css +++ b/lib/tpl/default/design.css @@ -38,7 +38,6 @@ div.dokuwiki p, div.dokuwiki blockquote, div.dokuwiki table, div.dokuwiki pre { - font-family: monospace; margin: 0 0 1.0em 0; } @@ -463,6 +462,7 @@ div.dokuwiki blockquote { } div.dokuwiki pre { + font-family: monospace; font-size: 120%; padding: 0.5em; border: 1px dashed __border__; -- cgit v1.2.3 From e600c8346b32e7cf7c0ffb525972907391b54426 Mon Sep 17 00:00:00 2001 From: Christopher Smith Date: Mon, 12 Apr 2010 10:50:05 +0100 Subject: Fix #1938, rtl style for blockquote --- lib/tpl/default/rtl.css | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'lib/tpl/default') diff --git a/lib/tpl/default/rtl.css b/lib/tpl/default/rtl.css index 4bc41858b..b59fcc783 100644 --- a/lib/tpl/default/rtl.css +++ b/lib/tpl/default/rtl.css @@ -121,4 +121,9 @@ div.dokuwiki .code { direction: ltr; text-align: left; } - +div.dokuwiki blockquote { + border-left: 0; + padding-left: 0; + border-right: 2px solid __border__; + padding-right: 3px; +} -- cgit v1.2.3 From b038bf62450c4c0aceb9f2cf7d4e24335d6e7bdf Mon Sep 17 00:00:00 2001 From: Gina Haeussge Date: Sat, 26 Jun 2010 14:11:35 +0200 Subject: FS#1874: removed padding for interwiki links in print stylesheet, as the icons aren't displayed there --- lib/tpl/default/print.css | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'lib/tpl/default') diff --git a/lib/tpl/default/print.css b/lib/tpl/default/print.css index 46a419b35..60c172585 100644 --- a/lib/tpl/default/print.css +++ b/lib/tpl/default/print.css @@ -21,6 +21,10 @@ a { background: none !important; } +a.interwiki { + padding-left: 0px !important; +} + div.meta { clear: both; -- cgit v1.2.3 From 2b2693ccbd870382d9b02623a4bffa6849cf70d4 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sat, 26 Jun 2010 13:57:50 +0100 Subject: fix for textarea bug in IE8 (FS#1910) --- lib/tpl/default/design.css | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'lib/tpl/default') diff --git a/lib/tpl/default/design.css b/lib/tpl/default/design.css index fdc41e55b..07ea6b55e 100644 --- a/lib/tpl/default/design.css +++ b/lib/tpl/default/design.css @@ -91,7 +91,10 @@ div.dokuwiki textarea.edit { background-color: __background__; border: 1px solid __border__; padding: 0.3em 0 0 0.3em; - width: 100%; + /* should just be "width: 100%", but IE8 doesn't like it, see FS#1910 + FS#1667 */ + width: 700px; + min-width: 100%; + max-width: 100%; } /* nice alphatransparency background except for IE <7 */ -- cgit v1.2.3 From 64373bfcbb5e8c82f512283345f7822f1b8ef69f Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sun, 27 Jun 2010 20:00:14 +0100 Subject: added min-width to footnote tooltips (partly FS#1931) --- lib/tpl/default/design.css | 1 + 1 file changed, 1 insertion(+) (limited to 'lib/tpl/default') diff --git a/lib/tpl/default/design.css b/lib/tpl/default/design.css index 07ea6b55e..09a9ecf01 100644 --- a/lib/tpl/default/design.css +++ b/lib/tpl/default/design.css @@ -692,6 +692,7 @@ div.insitu-footnote { text-align: left; padding: 4px; max-width: 40%; /* IE's width is handled in javascript */ + min-width: 5em; } /* overcome IE issue with one line code or file boxes which require h. scrolling */ -- cgit v1.2.3