From d637819dca760b20f6e53e5847a92d08d8d15b8c Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sun, 4 Aug 2013 10:36:50 +0100 Subject: added spacing below video and audio elements Note: The spacing will now show as too much as long as the paragraph bug is not fixed --- lib/tpl/dokuwiki/css/basic.css | 2 ++ 1 file changed, 2 insertions(+) (limited to 'lib/tpl') diff --git a/lib/tpl/dokuwiki/css/basic.css b/lib/tpl/dokuwiki/css/basic.css index ba263f4c5..ef278c939 100644 --- a/lib/tpl/dokuwiki/css/basic.css +++ b/lib/tpl/dokuwiki/css/basic.css @@ -93,6 +93,8 @@ pre, table, hr, blockquote, +video, +audio, figure, details, fieldset, -- cgit v1.2.3 From 5c2eed9a193e9341fbfee63d4a973898acdc5ee5 Mon Sep 17 00:00:00 2001 From: lisps Date: Thu, 21 Nov 2013 15:50:52 +0100 Subject: add parameter at($DATE_AT) and mind revisions --- lib/tpl/dokuwiki/detail.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/tpl') diff --git a/lib/tpl/dokuwiki/detail.php b/lib/tpl/dokuwiki/detail.php index ec846f6fd..49249612b 100644 --- a/lib/tpl/dokuwiki/detail.php +++ b/lib/tpl/dokuwiki/detail.php @@ -49,7 +49,7 @@ header('X-UA-Compatible: IE=edge,chrome=1'); if($ERROR): echo '

'.$ERROR.'

'; else: ?> - +

-- cgit v1.2.3 From b5f365b32820bb760e8c3729affce219f696d1ba Mon Sep 17 00:00:00 2001 From: Michael Hamann Date: Sun, 12 Jan 2014 22:45:08 +0100 Subject: dokuwiki template: Fix the preview width on small screens FS#2914 --- lib/tpl/dokuwiki/css/mobile.less | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'lib/tpl') diff --git a/lib/tpl/dokuwiki/css/mobile.less b/lib/tpl/dokuwiki/css/mobile.less index 289f5afa3..0fbd0e8fe 100644 --- a/lib/tpl/dokuwiki/css/mobile.less +++ b/lib/tpl/dokuwiki/css/mobile.less @@ -65,6 +65,15 @@ margin-right: 0; } +/* preview */ +.dokuwiki.hasSidebar div.preview { + border-right: none; +} + +[dir=rtl] .dokuwiki.hasSidebar div.preview { + border-left: none; +} + /* toc */ #dw__toc { float: none; -- cgit v1.2.3 From 3641199a253e8f92f378f03926af80724ef04146 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sun, 2 Feb 2014 14:42:47 +0000 Subject: fixed html errors in video and audio rendering --- lib/tpl/dokuwiki/css/basic.less | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lib/tpl') diff --git a/lib/tpl/dokuwiki/css/basic.less b/lib/tpl/dokuwiki/css/basic.less index 636923192..c296185e9 100644 --- a/lib/tpl/dokuwiki/css/basic.less +++ b/lib/tpl/dokuwiki/css/basic.less @@ -93,8 +93,6 @@ pre, table, hr, blockquote, -video, -audio, figure, details, fieldset, @@ -103,7 +101,9 @@ address { padding: 0; } -div { +div, +video, +audio { margin: 0; padding: 0; } -- cgit v1.2.3 From 221cb66533e11a3e20e642d760af06bb19f7e14b Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sat, 15 Feb 2014 16:02:59 +0000 Subject: fixed pagetools being inaccessible on screens lacking necessary height, and aligned them to content when on smaller screens --- lib/tpl/dokuwiki/css/mobile.less | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'lib/tpl') diff --git a/lib/tpl/dokuwiki/css/mobile.less b/lib/tpl/dokuwiki/css/mobile.less index 0fbd0e8fe..75ae5dbe4 100644 --- a/lib/tpl/dokuwiki/css/mobile.less +++ b/lib/tpl/dokuwiki/css/mobile.less @@ -105,6 +105,15 @@ overflow: auto; } +/* push pagetools closer to content */ +#dokuwiki__pagetools { + top: 0; +} +.showSidebar #dokuwiki__pagetools { + top: 3.5em; +} + + /* _edit */ .dokuwiki div.section_highlight { margin: 0 -1em; @@ -299,5 +308,17 @@ body { } +} /* /@media */ + + +/* for screen heights smaller than the pagetools permit +********************************************************************/ +@media only screen and (max-height: 400px) { +// 400px is only roughly the required value, this may be wrong under non-standard circumstances + +#dokuwiki__pagetools div.tools { + position: static; +} + } /* /@media */ -- cgit v1.2.3 From 6198904b0be1a338f774922e09c4b0d5050d853e Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sun, 16 Feb 2014 19:55:14 +0000 Subject: generalised link colour in header, making interwiki links blue as well (to fit design) --- lib/tpl/dokuwiki/css/design.less | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'lib/tpl') diff --git a/lib/tpl/dokuwiki/css/design.less b/lib/tpl/dokuwiki/css/design.less index 42292de49..235f6d6bc 100644 --- a/lib/tpl/dokuwiki/css/design.less +++ b/lib/tpl/dokuwiki/css/design.less @@ -48,6 +48,12 @@ margin-bottom: 0; font-size: 0.875em; } + + /* make all links in header (including breadcrumb and interwiki) same colour as the rest */ + a { + color: @ini_link; + background-color: inherit; + } } [dir=rtl] #dokuwiki__header h1 img { @@ -260,11 +266,6 @@ border-bottom: 1px solid @ini_border; } - a { - color: @ini_link; - background-color: inherit; - } - .bcsep { font-size: 0.75em; } -- cgit v1.2.3 From 98a6b21422744d0a705ef5afe6983e2797135d99 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Mon, 17 Feb 2014 01:46:56 +0000 Subject: roughly styled diff nav row --- lib/tpl/dokuwiki/css/_diff.css | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) (limited to 'lib/tpl') diff --git a/lib/tpl/dokuwiki/css/_diff.css b/lib/tpl/dokuwiki/css/_diff.css index b7c82d829..28cde7786 100644 --- a/lib/tpl/dokuwiki/css/_diff.css +++ b/lib/tpl/dokuwiki/css/_diff.css @@ -73,3 +73,41 @@ background-color: inherit; font-weight: bold; } + +/* diff nav */ + +.dokuwiki .diffnav a { + display: inline-block; + vertical-align: middle; +} +.dokuwiki .diffnav a span { + display: none; +} + +.dokuwiki .diffnav a:before { + font-size: 1.2em; + display: inline-block; + line-height: 1; + padding: .1em .2em; + border: 1px solid @ini_border; + border-radius: 2px; + color: @ini_text; +} + +.dokuwiki .diffnav a.diffprevrev:before { + content: '\25C0'; /* left triangle */ +} +.dokuwiki .diffnav a.diffnextrev:before, +.dokuwiki .diffnav a.difflastrev:before { + content: '\25B6'; /* right triangle */ +} +.dokuwiki .diffnav a.diffbothprevrev:before { + content: '\25C0\25C0'; +} +.dokuwiki .diffnav a.diffbothnextrev:before { + content: '\25B6\25B6'; +} + +.dokuwiki .diffnav select { + width: 15em; +} -- cgit v1.2.3 From 8f3927df350b53ee1287d66b36e9b29452c864f4 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Wed, 19 Feb 2014 01:21:07 +0000 Subject: improved styling of diff nav row --- lib/tpl/dokuwiki/css/_diff.css | 18 +++++++++-- lib/tpl/dokuwiki/css/basic.less | 1 + lib/tpl/dokuwiki/css/mobile.less | 6 ++-- lib/tpl/dokuwiki/css/sites/abcwiki.css | 39 +++++++++++++++++++++++ lib/tpl/dokuwiki/css/sites/paralis.css | 58 ++++++++++++++++++++++++++++++++++ 5 files changed, 118 insertions(+), 4 deletions(-) create mode 100644 lib/tpl/dokuwiki/css/sites/abcwiki.css create mode 100644 lib/tpl/dokuwiki/css/sites/paralis.css (limited to 'lib/tpl') diff --git a/lib/tpl/dokuwiki/css/_diff.css b/lib/tpl/dokuwiki/css/_diff.css index 28cde7786..13c3012d9 100644 --- a/lib/tpl/dokuwiki/css/_diff.css +++ b/lib/tpl/dokuwiki/css/_diff.css @@ -76,6 +76,9 @@ /* diff nav */ +.dokuwiki table.diff_sidebyside td.diffnav { + padding-bottom: .7em; +} .dokuwiki .diffnav a { display: inline-block; vertical-align: middle; @@ -84,11 +87,17 @@ display: none; } +.dokuwiki .diffnav a:hover, +.dokuwiki .diffnav a:active, +.dokuwiki .diffnav a:focus { + background-color: @ini_background_alt; + text-decoration: none; +} + .dokuwiki .diffnav a:before { - font-size: 1.2em; display: inline-block; line-height: 1; - padding: .1em .2em; + padding: .2em .4em; border: 1px solid @ini_border; border-radius: 2px; color: @ini_text; @@ -110,4 +119,9 @@ .dokuwiki .diffnav select { width: 15em; + height: 1.5em; /* height is necessary for longer options in Webkit */ +} + +.dokuwiki .diffnav select option[selected] { + font-weight: bold; } diff --git a/lib/tpl/dokuwiki/css/basic.less b/lib/tpl/dokuwiki/css/basic.less index c296185e9..ac9f6803a 100644 --- a/lib/tpl/dokuwiki/css/basic.less +++ b/lib/tpl/dokuwiki/css/basic.less @@ -455,6 +455,7 @@ input[disabled], button[disabled], select[disabled], textarea[disabled], +option[disabled], input[readonly], button[readonly], select[readonly], diff --git a/lib/tpl/dokuwiki/css/mobile.less b/lib/tpl/dokuwiki/css/mobile.less index 0fbd0e8fe..6d552876d 100644 --- a/lib/tpl/dokuwiki/css/mobile.less +++ b/lib/tpl/dokuwiki/css/mobile.less @@ -266,11 +266,13 @@ body { #config__manager td .input, .dokuwiki fieldset, .dokuwiki input.edit, -.dokuwiki textarea, -.dokuwiki select { +.dokuwiki textarea { width: auto !important; max-width: 100% !important; } +.dokuwiki select { + max-width: 100% !important; +} #config__manager fieldset { margin-left: 0; margin-right: 0; diff --git a/lib/tpl/dokuwiki/css/sites/abcwiki.css b/lib/tpl/dokuwiki/css/sites/abcwiki.css new file mode 100644 index 000000000..9f436516b --- /dev/null +++ b/lib/tpl/dokuwiki/css/sites/abcwiki.css @@ -0,0 +1,39 @@ + +html, +body { + background-color: #369; +} + +#dokuwiki__header, +#dokuwiki__aside, +.docInfo, +#dokuwiki__footer { + color: #fff; +} + +#dokuwiki__header a, +#dokuwiki__aside a, +.docInfo a, +#dokuwiki__footer a { + color: #ff9 !important; +} + +h1, +h2, +h3, +h4, +h5, +h6 { + color: #036; +} + +.dokuwiki div.breadcrumbs { + border-top-color: #999; + border-bottom-color: #666; +} +.dokuwiki div.breadcrumbs div:first-child { + border-bottom-color: #999; +} +.dokuwiki div.breadcrumbs div:last-child { + border-top-color: #666; +} diff --git a/lib/tpl/dokuwiki/css/sites/paralis.css b/lib/tpl/dokuwiki/css/sites/paralis.css new file mode 100644 index 000000000..201bca936 --- /dev/null +++ b/lib/tpl/dokuwiki/css/sites/paralis.css @@ -0,0 +1,58 @@ + +@media screen { + +body { + font: normal 100%/1.4 Frutiger, Calibri, "Myriad Pro", Myriad, "Nimbus Sans L", Geneva, "Helvetica Neue", Helvetica, Arial, sans-serif; +} + +h1, +h2, +h3, +h4, +h5, +h6 { + font-family: Constantia, Utopia, Lucidabright, Lucida, Georgia, "Nimbus Roman No9 L", serif; + color: @ini_text_neu; +} + +q { + font-style: italic; +} + +#dokuwiki__header h1 a { + color: @ini_link; + font-weight: bold; +} + +div.dokuwiki p.plugin__pagenav { + margin: 0 0 1.4em; +} + + +} /* /@media */ + + +#dokuwiki__header h1 { + position: relative; +} +#dokuwiki__header h1 img { + position: absolute; + top: -27px; + left: -33px; + max-width: none; +} +#dokuwiki__header h1 { + padding-left: 110px; +} +#dokuwiki__header p.claim { + padding-left: 110px; +} + + +@media print { + +.dokuwiki p.plugin__pagenav { + display: none; +} + +} /* /@media */ -- cgit v1.2.3 From c130b0f8ec18ec66ac40422cf354a23268108866 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Wed, 19 Feb 2014 01:34:14 +0000 Subject: improved positioning of diff options --- lib/tpl/dokuwiki/css/_diff.css | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'lib/tpl') diff --git a/lib/tpl/dokuwiki/css/_diff.css b/lib/tpl/dokuwiki/css/_diff.css index 13c3012d9..09e95d9f6 100644 --- a/lib/tpl/dokuwiki/css/_diff.css +++ b/lib/tpl/dokuwiki/css/_diff.css @@ -74,6 +74,15 @@ font-weight: bold; } +/* diff options */ + +.dokuwiki .diffoptions form { + float: left; +} +.dokuwiki .diffoptions p { + float: right; +} + /* diff nav */ .dokuwiki table.diff_sidebyside td.diffnav { -- cgit v1.2.3 From 0b1e5003aae587074526c6b2ef19cb84670195e8 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sun, 23 Feb 2014 21:20:39 +0000 Subject: made search form styles independent from sitetools ID --- lib/tpl/dokuwiki/css/design.less | 64 ++++++++++++++++++++-------------------- 1 file changed, 32 insertions(+), 32 deletions(-) (limited to 'lib/tpl') diff --git a/lib/tpl/dokuwiki/css/design.less b/lib/tpl/dokuwiki/css/design.less index 42292de49..b18daaad7 100644 --- a/lib/tpl/dokuwiki/css/design.less +++ b/lib/tpl/dokuwiki/css/design.less @@ -186,50 +186,50 @@ text-align: right; form.search { - display: block; font-size: 0.875em; - position: relative; + } +} - input.edit { - width: 18em; - padding: .35em 22px .35em .1em; - } +[dir=rtl] #dokuwiki__sitetools { + text-align: left; +} - input.button { - background: transparent url(images/search.png) no-repeat 0 0; - border-width: 0; - width: 19px; - height: 14px; - text-indent: -99999px; - margin-left: -20px; - box-shadow: none; - padding: 0; - } +form.search { + display: block; + position: relative; + margin-bottom: 0.5em; + + input.edit { + width: 18em; + padding: .35em 22px .35em .1em; } - ul { - margin-top: 0.5em; + input.button { + background: transparent url(images/search.png) no-repeat 0 0; + border-width: 0; + width: 19px; + height: 14px; + text-indent: -99999px; + margin-left: -20px; + box-shadow: none; + padding: 0; } } -[dir=rtl] #dokuwiki__sitetools { - text-align: left; - - form.search { - input.edit { - padding: .35em .1em .35em 22px; - } +[dir=rtl] form.search { + input.edit { + padding: .35em .1em .35em 22px; + } - input.button { - background-position: 5px 0; - margin-left: 0; - margin-right: -20px; - position: relative; - } + input.button { + background-position: 5px 0; + margin-left: 0; + margin-right: -20px; + position: relative; } } -#IE7 #dokuwiki__sitetools form.search { +#IE7 form.search { min-height: 1px; z-index: 21; } -- cgit v1.2.3 From 1e94c175409c39f190b7da3a1941230f3758513c Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sun, 23 Feb 2014 21:38:28 +0000 Subject: made sidebar content styles re-usable outside of ID (added class: aside) --- lib/tpl/dokuwiki/css/content.less | 22 +++++++++++----------- lib/tpl/dokuwiki/css/design.less | 15 ++++++--------- lib/tpl/dokuwiki/main.php | 2 +- 3 files changed, 18 insertions(+), 21 deletions(-) (limited to 'lib/tpl') diff --git a/lib/tpl/dokuwiki/css/content.less b/lib/tpl/dokuwiki/css/content.less index a5ffbf2be..a2e343a33 100644 --- a/lib/tpl/dokuwiki/css/content.less +++ b/lib/tpl/dokuwiki/css/content.less @@ -67,19 +67,19 @@ /*____________ lists ____________*/ -#dokuwiki__content ul li, -#dokuwiki__aside ul li { - color: @ini_text_alt; -} +.dokuwiki .page, +.dokuwiki .aside { + ul li { + color: @ini_text_alt; + } -#dokuwiki__content ol li, -#dokuwiki__aside ol li { - color: @ini_text_neu; -} + ol li { + color: @ini_text_neu; + } -#dokuwiki__content li .li, -#dokuwiki__aside li .li { - color: @ini_text; + li .li { + color: @ini_text; + } } /*____________ tables ____________*/ diff --git a/lib/tpl/dokuwiki/css/design.less b/lib/tpl/dokuwiki/css/design.less index b18daaad7..46b4a045b 100644 --- a/lib/tpl/dokuwiki/css/design.less +++ b/lib/tpl/dokuwiki/css/design.less @@ -278,13 +278,10 @@ form.search { /* sidebar ********************************************************************/ -#dokuwiki__aside { - - > .pad { - font-size: 0.875em; - overflow: hidden; - word-wrap: break-word; - } +.dokuwiki .aside { + font-size: 0.875em; + overflow: hidden; + word-wrap: break-word; /* make sidebar more condensed */ @@ -340,8 +337,8 @@ form.search { } } -[dir=rtl] #dokuwiki__aside ul, -[dir=rtl] #dokuwiki__aside ol { +[dir=rtl] .dokuwiki .aside ul, +[dir=rtl] .dokuwiki .aside ol { padding-right: .5em; } diff --git a/lib/tpl/dokuwiki/main.php b/lib/tpl/dokuwiki/main.php index 3bc46406a..44fef81eb 100644 --- a/lib/tpl/dokuwiki/main.php +++ b/lib/tpl/dokuwiki/main.php @@ -36,7 +36,7 @@ $showSidebar = $hasSidebar && ($ACT=='show'); -
+

-- cgit v1.2.3 From becfa414b5b024ded4e094b1c113a72f39d8b763 Mon Sep 17 00:00:00 2001 From: Gerrit Uitslag Date: Tue, 25 Feb 2014 15:45:00 +0100 Subject: refactor detail.php to template.php - refactor detail en mediamanager link creation - refactor metadata listing --- lib/tpl/dokuwiki/css/pagetools.less | 1 + lib/tpl/dokuwiki/detail.php | 54 +++++++------------------------------ 2 files changed, 10 insertions(+), 45 deletions(-) (limited to 'lib/tpl') diff --git a/lib/tpl/dokuwiki/css/pagetools.less b/lib/tpl/dokuwiki/css/pagetools.less index ecb3038c3..77d2670a6 100644 --- a/lib/tpl/dokuwiki/css/pagetools.less +++ b/lib/tpl/dokuwiki/css/pagetools.less @@ -231,3 +231,4 @@ .pagetools-item(subscribe, 9, subscribe); .pagetools-item(mediaManager, 11); .pagetools-item(back, 12); +.pagetools-item(img_backto, 12); diff --git a/lib/tpl/dokuwiki/detail.php b/lib/tpl/dokuwiki/detail.php index ec846f6fd..8fe2c88a2 100644 --- a/lib/tpl/dokuwiki/detail.php +++ b/lib/tpl/dokuwiki/detail.php @@ -55,37 +55,7 @@ header('X-UA-Compatible: IE=edge,chrome=1');
-
- $tag){ - $t = array(); - if (!empty($tag[0])) { - $t = array($tag[0]); - } - if(is_array($tag[3])) { - $t = array_merge($t,$tag[3]); - } - $value = tpl_img_getTag($t); - if ($value) { - echo '
'.$lang[$tag[1]].':
'; - if ($tag[2] == 'date') { - echo dformat($value); - } else { - echo hsc($value); - } - echo '
'; - } - } - ?> -
+
@@ -109,23 +79,17 @@ header('X-UA-Compatible: IE=edge,chrome=1');
    = AUTH_UPLOAD) && function_exists('media_managerURL')) { - $mmURL = media_managerURL(array('ns' => $imgNS, 'image' => $IMG)); - $data['items']['mediaManager'] = '
  • '.$lang['img_manager'].'
    • '; - } - - // Back to [ID]; @todo: transfer logic to backend - $data['items']['img_backto'] = '
  • '.$lang['img_backto'].' '.$ID.'
    • '; + $data = array( + 'view' => 'detail', + 'items' => array( + 'mediaManager' => tpl_action('mediaManager', 1, 'li', 1, '', ''), + 'img_backto' => tpl_action('img_backto', 1, 'li', 1, '', ''), + ) + ); // the page tools can be amended through a custom plugin hook $evt = new Doku_Event('TEMPLATE_PAGETOOLS_DISPLAY', $data); - if($evt->advise_before()){ + if($evt->advise_before()) { foreach($evt->data['items'] as $k => $html) echo $html; } $evt->advise_after(); -- cgit v1.2.3 From c18baa7e07ae2f57b2fcaaef64e3bb338cef85ae Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Sat, 15 Mar 2014 20:08:44 +0100 Subject: override user link icon in header --- lib/tpl/dokuwiki/css/design.less | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'lib/tpl') diff --git a/lib/tpl/dokuwiki/css/design.less b/lib/tpl/dokuwiki/css/design.less index 60a66f069..66607b5e9 100644 --- a/lib/tpl/dokuwiki/css/design.less +++ b/lib/tpl/dokuwiki/css/design.less @@ -106,7 +106,8 @@ margin-left: 0; } -#dokuwiki__usertools a.action { +#dokuwiki__usertools a.action, +#dokuwiki__usertools a.iw_user { padding-left: 20px; background: transparent url(images/usertools.png) no-repeat 0 0; } @@ -143,6 +144,7 @@ background-position: left 0; } + a.iw_user, a.action.profile { background-position: left -32px; } -- cgit v1.2.3 From 01486f869816b6358d14a710f3d89b190e9391b4 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sun, 16 Mar 2014 19:08:14 +0000 Subject: tiny improvement on diffnav select width --- lib/tpl/dokuwiki/css/_diff.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'lib/tpl') diff --git a/lib/tpl/dokuwiki/css/_diff.css b/lib/tpl/dokuwiki/css/_diff.css index 09e95d9f6..bc56a37c4 100644 --- a/lib/tpl/dokuwiki/css/_diff.css +++ b/lib/tpl/dokuwiki/css/_diff.css @@ -127,7 +127,8 @@ } .dokuwiki .diffnav select { - width: 15em; + width: 60%; + min-width: 9em; height: 1.5em; /* height is necessary for longer options in Webkit */ } -- cgit v1.2.3 From 8bd5828d4ea6813605d73632ec6dfad65af787cb Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sun, 6 Apr 2014 18:35:17 +0100 Subject: oops, removed unintentionally added CSS files --- lib/tpl/dokuwiki/css/sites/abcwiki.css | 39 ----------------------- lib/tpl/dokuwiki/css/sites/paralis.css | 58 ---------------------------------- 2 files changed, 97 deletions(-) delete mode 100644 lib/tpl/dokuwiki/css/sites/abcwiki.css delete mode 100644 lib/tpl/dokuwiki/css/sites/paralis.css (limited to 'lib/tpl') diff --git a/lib/tpl/dokuwiki/css/sites/abcwiki.css b/lib/tpl/dokuwiki/css/sites/abcwiki.css deleted file mode 100644 index 9f436516b..000000000 --- a/lib/tpl/dokuwiki/css/sites/abcwiki.css +++ /dev/null @@ -1,39 +0,0 @@ - -html, -body { - background-color: #369; -} - -#dokuwiki__header, -#dokuwiki__aside, -.docInfo, -#dokuwiki__footer { - color: #fff; -} - -#dokuwiki__header a, -#dokuwiki__aside a, -.docInfo a, -#dokuwiki__footer a { - color: #ff9 !important; -} - -h1, -h2, -h3, -h4, -h5, -h6 { - color: #036; -} - -.dokuwiki div.breadcrumbs { - border-top-color: #999; - border-bottom-color: #666; -} -.dokuwiki div.breadcrumbs div:first-child { - border-bottom-color: #999; -} -.dokuwiki div.breadcrumbs div:last-child { - border-top-color: #666; -} diff --git a/lib/tpl/dokuwiki/css/sites/paralis.css b/lib/tpl/dokuwiki/css/sites/paralis.css deleted file mode 100644 index 201bca936..000000000 --- a/lib/tpl/dokuwiki/css/sites/paralis.css +++ /dev/null @@ -1,58 +0,0 @@ - -@media screen { - -body { - font: normal 100%/1.4 Frutiger, Calibri, "Myriad Pro", Myriad, "Nimbus Sans L", Geneva, "Helvetica Neue", Helvetica, Arial, sans-serif; -} - -h1, -h2, -h3, -h4, -h5, -h6 { - font-family: Constantia, Utopia, Lucidabright, Lucida, Georgia, "Nimbus Roman No9 L", serif; - color: @ini_text_neu; -} - -q { - font-style: italic; -} - -#dokuwiki__header h1 a { - color: @ini_link; - font-weight: bold; -} - -div.dokuwiki p.plugin__pagenav { - margin: 0 0 1.4em; -} - - -} /* /@media */ - - -#dokuwiki__header h1 { - position: relative; -} -#dokuwiki__header h1 img { - position: absolute; - top: -27px; - left: -33px; - max-width: none; -} -#dokuwiki__header h1 { - padding-left: 110px; -} -#dokuwiki__header p.claim { - padding-left: 110px; -} - - -@media print { - -.dokuwiki p.plugin__pagenav { - display: none; -} - -} /* /@media */ -- cgit v1.2.3 From 5fd5f78803a876c5808be4d3ba63cc5b85754f25 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Sun, 22 Jun 2014 21:00:52 +0200 Subject: fixed template color replacement preview --- lib/tpl/index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/tpl') diff --git a/lib/tpl/index.php b/lib/tpl/index.php index 3c00ab8e8..558f262a7 100644 --- a/lib/tpl/index.php +++ b/lib/tpl/index.php @@ -46,7 +46,7 @@ require_once(DOKU_INC.'inc/init.php'); // get merged style.ini define('SIMPLE_TEST', true); // hack to prevent css output and headers require_once(DOKU_INC.'lib/exe/css.php'); -$ini = css_styleini(tpl_incdir()); +$ini = css_styleini($conf['template']); if ($ini) { echo ''; -- cgit v1.2.3 From 75112fc56c5237220d4fe1b104317f62eda8a561 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sat, 2 Aug 2014 12:19:38 +0100 Subject: updated dates in info.txt of various plugins and template --- lib/tpl/dokuwiki/template.info.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/tpl') diff --git a/lib/tpl/dokuwiki/template.info.txt b/lib/tpl/dokuwiki/template.info.txt index 9d062655d..804d595ae 100644 --- a/lib/tpl/dokuwiki/template.info.txt +++ b/lib/tpl/dokuwiki/template.info.txt @@ -1,7 +1,7 @@ base dokuwiki author Anika Henke email anika@selfthinker.org -date 2013-05-02 +date 2014-06-04 name DokuWiki Template desc DokuWiki's default template since 2012 url http://www.dokuwiki.org/template:dokuwiki -- cgit v1.2.3 From e0c26282a603881e8d2f839d94c28dbbfc57d71b Mon Sep 17 00:00:00 2001 From: Gerrit Uitslag Date: Mon, 29 Sep 2014 03:34:17 +0200 Subject: scrutinizer documentations issues --- lib/tpl/dokuwiki/detail.php | 4 ++-- lib/tpl/dokuwiki/images/pagetools-build.php | 2 +- lib/tpl/dokuwiki/main.php | 14 +++++++------- lib/tpl/dokuwiki/tpl_header.php | 14 +++++++------- 4 files changed, 17 insertions(+), 17 deletions(-) (limited to 'lib/tpl') diff --git a/lib/tpl/dokuwiki/detail.php b/lib/tpl/dokuwiki/detail.php index 8fe2c88a2..4d0e984b1 100644 --- a/lib/tpl/dokuwiki/detail.php +++ b/lib/tpl/dokuwiki/detail.php @@ -82,8 +82,8 @@ header('X-UA-Compatible: IE=edge,chrome=1'); $data = array( 'view' => 'detail', 'items' => array( - 'mediaManager' => tpl_action('mediaManager', 1, 'li', 1, '', ''), - 'img_backto' => tpl_action('img_backto', 1, 'li', 1, '', ''), + 'mediaManager' => tpl_action('mediaManager', true, 'li', true, '', ''), + 'img_backto' => tpl_action('img_backto', true, 'li', true, '', ''), ) ); diff --git a/lib/tpl/dokuwiki/images/pagetools-build.php b/lib/tpl/dokuwiki/images/pagetools-build.php index 1b7262ad5..3cf35b2ea 100644 --- a/lib/tpl/dokuwiki/images/pagetools-build.php +++ b/lib/tpl/dokuwiki/images/pagetools-build.php @@ -92,7 +92,7 @@ function hex2rgb($hex) { /** * Scale (darken/lighten) a given image * - * @param ressource $img The truetype GD image to work on + * @param resource $img The truetype GD image to work on * @param float $scale Scale the colors by this value ( <1 darkens, >1 lightens) */ function imagecolorscale(&$img, $scale){ diff --git a/lib/tpl/dokuwiki/main.php b/lib/tpl/dokuwiki/main.php index 44fef81eb..10c0bf91e 100644 --- a/lib/tpl/dokuwiki/main.php +++ b/lib/tpl/dokuwiki/main.php @@ -41,7 +41,7 @@ $showSidebar = $hasSidebar && ($ACT=='show');
    - +
    @@ -77,12 +77,12 @@ $showSidebar = $hasSidebar && ($ACT=='show'); $data = array( 'view' => 'main', 'items' => array( - 'edit' => tpl_action('edit', 1, 'li', 1, '', ''), - 'revert' => tpl_action('revert', 1, 'li', 1, '', ''), - 'revisions' => tpl_action('revisions', 1, 'li', 1, '', ''), - 'backlink' => tpl_action('backlink', 1, 'li', 1, '', ''), - 'subscribe' => tpl_action('subscribe', 1, 'li', 1, '', ''), - 'top' => tpl_action('top', 1, 'li', 1, '', '') + 'edit' => tpl_action('edit', true, 'li', true, '', ''), + 'revert' => tpl_action('revert', true, 'li', true, '', ''), + 'revisions' => tpl_action('revisions', true, 'li', true, '', ''), + 'backlink' => tpl_action('backlink', true, 'li', true, '', ''), + 'subscribe' => tpl_action('subscribe', true, 'li', true, '', ''), + 'top' => tpl_action('top', true, 'li', true, '', '') ) ); diff --git a/lib/tpl/dokuwiki/tpl_header.php b/lib/tpl/dokuwiki/tpl_header.php index a2bfd4346..7d9c88347 100644 --- a/lib/tpl/dokuwiki/tpl_header.php +++ b/lib/tpl/dokuwiki/tpl_header.php @@ -46,10 +46,10 @@ if (!defined('DOKU_INC')) die(); tpl_userinfo(); /* 'Logged in as ...' */ echo ''; } - tpl_action('admin', 1, 'li'); - tpl_action('profile', 1, 'li'); - tpl_action('register', 1, 'li'); - tpl_action('login', 1, 'li'); + tpl_action('admin', true, 'li'); + tpl_action('profile', true, 'li'); + tpl_action('register', true, 'li'); + tpl_action('login', true, 'li'); ?> @@ -64,9 +64,9 @@ if (!defined('DOKU_INC')) die();
    -- cgit v1.2.3 From 3940c519db432ec22e8c587504d86191631f9bfb Mon Sep 17 00:00:00 2001 From: Mark Date: Wed, 8 Jan 2014 11:56:06 +0100 Subject: use nav+ul element for "you are here" As described in the common idioms of the HTML5 spec, mark up navigation as a list inside a `nav` element for better semantics and accessibility. see: * http://www.w3.org/html/wg/drafts/html/master/common-idioms.html#rel-up * http://lists.w3.org/Archives/Public/public-html/2013Nov/thread.html#msg6 * https://dl.dropboxusercontent.com/u/377471/breadcrumb.html for discussion and background. --- lib/tpl/dokuwiki/css/mixins.less | 15 ++++++++++++++- lib/tpl/dokuwiki/css/structure.less | 15 +++++++++++++++ 2 files changed, 29 insertions(+), 1 deletion(-) (limited to 'lib/tpl') diff --git a/lib/tpl/dokuwiki/css/mixins.less b/lib/tpl/dokuwiki/css/mixins.less index a88767e97..4b15bb600 100644 --- a/lib/tpl/dokuwiki/css/mixins.less +++ b/lib/tpl/dokuwiki/css/mixins.less @@ -7,4 +7,17 @@ background: -o-linear-gradient( @declaration); background: -ms-linear-gradient( @declaration); background: linear-gradient( @declaration); -} \ No newline at end of file +} + +/** + * provides inline list styling. + */ +.inline-list(){ + list-style-type: none; + + & li { + margin: 0; + padding: 0; + display: inline; + } +} diff --git a/lib/tpl/dokuwiki/css/structure.less b/lib/tpl/dokuwiki/css/structure.less index 3ea2f83eb..f7dea3948 100644 --- a/lib/tpl/dokuwiki/css/structure.less +++ b/lib/tpl/dokuwiki/css/structure.less @@ -87,3 +87,18 @@ body { #dokuwiki__footer { clear: both; } + +.dokuwiki .navlist { + display: inline; + padding: 0; + .inline-list; +} + +.bchead { + display: inline; + font-size: inherit; +} + +.curid { + font-weight: bold; +} -- cgit v1.2.3 From 5af3d1cd434f85882bb29253a3757cacc5c5338a Mon Sep 17 00:00:00 2001 From: KeenRivals Date: Wed, 14 Jan 2015 16:14:41 -0500 Subject: Losslessly reduced PNG images with optipng -o7 -strip all, advdef -z4 -i60, and advpng -z4 -i60. --- lib/tpl/dokuwiki/images/apple-touch-icon.png | Bin 6399 -> 6336 bytes lib/tpl/dokuwiki/images/button-css.png | Bin 299 -> 297 bytes lib/tpl/dokuwiki/images/button-html5.png | Bin 354 -> 305 bytes lib/tpl/dokuwiki/images/button-rss.png | Bin 180 -> 178 bytes lib/tpl/dokuwiki/images/logo.png | Bin 3820 -> 3744 bytes lib/tpl/dokuwiki/images/page-gradient.png | Bin 280 -> 209 bytes lib/tpl/dokuwiki/images/pagetools-sprite.png | Bin 11325 -> 7759 bytes lib/tpl/dokuwiki/images/pagetools/00_default.png | Bin 616 -> 494 bytes lib/tpl/dokuwiki/images/pagetools/01_edit.png | Bin 740 -> 519 bytes lib/tpl/dokuwiki/images/pagetools/02_create.png | Bin 808 -> 580 bytes lib/tpl/dokuwiki/images/pagetools/03_draft.png | Bin 828 -> 592 bytes lib/tpl/dokuwiki/images/pagetools/04_show.png | Bin 458 -> 321 bytes lib/tpl/dokuwiki/images/pagetools/05_source.png | Bin 753 -> 478 bytes lib/tpl/dokuwiki/images/pagetools/06_revert.png | Bin 752 -> 462 bytes lib/tpl/dokuwiki/images/pagetools/07_revisions.png | Bin 1144 -> 769 bytes lib/tpl/dokuwiki/images/pagetools/08_backlink.png | Bin 844 -> 527 bytes lib/tpl/dokuwiki/images/pagetools/09_subscribe.png | Bin 589 -> 374 bytes lib/tpl/dokuwiki/images/pagetools/10_top.png | Bin 465 -> 297 bytes .../dokuwiki/images/pagetools/11_mediamanager.png | Bin 441 -> 320 bytes lib/tpl/dokuwiki/images/pagetools/12_back.png | Bin 483 -> 288 bytes lib/tpl/dokuwiki/images/search.png | Bin 316 -> 307 bytes lib/tpl/dokuwiki/images/toc-bullet.png | Bin 121 -> 113 bytes lib/tpl/dokuwiki/images/usertools.png | Bin 1541 -> 1428 bytes 23 files changed, 0 insertions(+), 0 deletions(-) (limited to 'lib/tpl') diff --git a/lib/tpl/dokuwiki/images/apple-touch-icon.png b/lib/tpl/dokuwiki/images/apple-touch-icon.png index fb5f108c0..87c99a919 100644 Binary files a/lib/tpl/dokuwiki/images/apple-touch-icon.png and b/lib/tpl/dokuwiki/images/apple-touch-icon.png differ diff --git a/lib/tpl/dokuwiki/images/button-css.png b/lib/tpl/dokuwiki/images/button-css.png index 706325e1c..5c0f5a993 100644 Binary files a/lib/tpl/dokuwiki/images/button-css.png and b/lib/tpl/dokuwiki/images/button-css.png differ diff --git a/lib/tpl/dokuwiki/images/button-html5.png b/lib/tpl/dokuwiki/images/button-html5.png index 5885a331b..f7b068811 100644 Binary files a/lib/tpl/dokuwiki/images/button-html5.png and b/lib/tpl/dokuwiki/images/button-html5.png differ diff --git a/lib/tpl/dokuwiki/images/button-rss.png b/lib/tpl/dokuwiki/images/button-rss.png index b7cddadec..aa6b7fca8 100644 Binary files a/lib/tpl/dokuwiki/images/button-rss.png and b/lib/tpl/dokuwiki/images/button-rss.png differ diff --git a/lib/tpl/dokuwiki/images/logo.png b/lib/tpl/dokuwiki/images/logo.png index 35640279c..a1f499569 100644 Binary files a/lib/tpl/dokuwiki/images/logo.png and b/lib/tpl/dokuwiki/images/logo.png differ diff --git a/lib/tpl/dokuwiki/images/page-gradient.png b/lib/tpl/dokuwiki/images/page-gradient.png index 8e16a2805..38c74198a 100644 Binary files a/lib/tpl/dokuwiki/images/page-gradient.png and b/lib/tpl/dokuwiki/images/page-gradient.png differ diff --git a/lib/tpl/dokuwiki/images/pagetools-sprite.png b/lib/tpl/dokuwiki/images/pagetools-sprite.png index b6e808717..8e7f7f876 100644 Binary files a/lib/tpl/dokuwiki/images/pagetools-sprite.png and b/lib/tpl/dokuwiki/images/pagetools-sprite.png differ diff --git a/lib/tpl/dokuwiki/images/pagetools/00_default.png b/lib/tpl/dokuwiki/images/pagetools/00_default.png index 95d122e17..bcb2de0f8 100644 Binary files a/lib/tpl/dokuwiki/images/pagetools/00_default.png and b/lib/tpl/dokuwiki/images/pagetools/00_default.png differ diff --git a/lib/tpl/dokuwiki/images/pagetools/01_edit.png b/lib/tpl/dokuwiki/images/pagetools/01_edit.png index ad4a737d8..99f3093ee 100644 Binary files a/lib/tpl/dokuwiki/images/pagetools/01_edit.png and b/lib/tpl/dokuwiki/images/pagetools/01_edit.png differ diff --git a/lib/tpl/dokuwiki/images/pagetools/02_create.png b/lib/tpl/dokuwiki/images/pagetools/02_create.png index e4fc5d3b1..57fa68d42 100644 Binary files a/lib/tpl/dokuwiki/images/pagetools/02_create.png and b/lib/tpl/dokuwiki/images/pagetools/02_create.png differ diff --git a/lib/tpl/dokuwiki/images/pagetools/03_draft.png b/lib/tpl/dokuwiki/images/pagetools/03_draft.png index a13d8c3b4..ce1c6cf14 100644 Binary files a/lib/tpl/dokuwiki/images/pagetools/03_draft.png and b/lib/tpl/dokuwiki/images/pagetools/03_draft.png differ diff --git a/lib/tpl/dokuwiki/images/pagetools/04_show.png b/lib/tpl/dokuwiki/images/pagetools/04_show.png index 6f64b1bd1..1ced340dd 100644 Binary files a/lib/tpl/dokuwiki/images/pagetools/04_show.png and b/lib/tpl/dokuwiki/images/pagetools/04_show.png differ diff --git a/lib/tpl/dokuwiki/images/pagetools/05_source.png b/lib/tpl/dokuwiki/images/pagetools/05_source.png index bcc4fa21f..dffe1931a 100644 Binary files a/lib/tpl/dokuwiki/images/pagetools/05_source.png and b/lib/tpl/dokuwiki/images/pagetools/05_source.png differ diff --git a/lib/tpl/dokuwiki/images/pagetools/06_revert.png b/lib/tpl/dokuwiki/images/pagetools/06_revert.png index 7b8457e5e..18c644474 100644 Binary files a/lib/tpl/dokuwiki/images/pagetools/06_revert.png and b/lib/tpl/dokuwiki/images/pagetools/06_revert.png differ diff --git a/lib/tpl/dokuwiki/images/pagetools/07_revisions.png b/lib/tpl/dokuwiki/images/pagetools/07_revisions.png index d918bce05..e599d016c 100644 Binary files a/lib/tpl/dokuwiki/images/pagetools/07_revisions.png and b/lib/tpl/dokuwiki/images/pagetools/07_revisions.png differ diff --git a/lib/tpl/dokuwiki/images/pagetools/08_backlink.png b/lib/tpl/dokuwiki/images/pagetools/08_backlink.png index 2c0823a72..aa34e2775 100644 Binary files a/lib/tpl/dokuwiki/images/pagetools/08_backlink.png and b/lib/tpl/dokuwiki/images/pagetools/08_backlink.png differ diff --git a/lib/tpl/dokuwiki/images/pagetools/09_subscribe.png b/lib/tpl/dokuwiki/images/pagetools/09_subscribe.png index 30e039dbc..36254ff53 100644 Binary files a/lib/tpl/dokuwiki/images/pagetools/09_subscribe.png and b/lib/tpl/dokuwiki/images/pagetools/09_subscribe.png differ diff --git a/lib/tpl/dokuwiki/images/pagetools/10_top.png b/lib/tpl/dokuwiki/images/pagetools/10_top.png index e4bf1d49d..b930fd25f 100644 Binary files a/lib/tpl/dokuwiki/images/pagetools/10_top.png and b/lib/tpl/dokuwiki/images/pagetools/10_top.png differ diff --git a/lib/tpl/dokuwiki/images/pagetools/11_mediamanager.png b/lib/tpl/dokuwiki/images/pagetools/11_mediamanager.png index 36116802f..71b5a3372 100644 Binary files a/lib/tpl/dokuwiki/images/pagetools/11_mediamanager.png and b/lib/tpl/dokuwiki/images/pagetools/11_mediamanager.png differ diff --git a/lib/tpl/dokuwiki/images/pagetools/12_back.png b/lib/tpl/dokuwiki/images/pagetools/12_back.png index d154651ec..6d6093ed6 100644 Binary files a/lib/tpl/dokuwiki/images/pagetools/12_back.png and b/lib/tpl/dokuwiki/images/pagetools/12_back.png differ diff --git a/lib/tpl/dokuwiki/images/search.png b/lib/tpl/dokuwiki/images/search.png index 1ab7866fb..a07a721df 100644 Binary files a/lib/tpl/dokuwiki/images/search.png and b/lib/tpl/dokuwiki/images/search.png differ diff --git a/lib/tpl/dokuwiki/images/toc-bullet.png b/lib/tpl/dokuwiki/images/toc-bullet.png index fc771b97e..a2dfa47e9 100644 Binary files a/lib/tpl/dokuwiki/images/toc-bullet.png and b/lib/tpl/dokuwiki/images/toc-bullet.png differ diff --git a/lib/tpl/dokuwiki/images/usertools.png b/lib/tpl/dokuwiki/images/usertools.png index e99b6596e..68102271f 100644 Binary files a/lib/tpl/dokuwiki/images/usertools.png and b/lib/tpl/dokuwiki/images/usertools.png differ -- cgit v1.2.3