diff options
| author | Anika Henke <anika@selfthinker.org> | 2013-06-02 23:14:12 +0100 |
|---|---|---|
| committer | Anika Henke <anika@selfthinker.org> | 2013-06-02 23:14:12 +0100 |
| commit | 20beef63b4694afdc3d6c434c3d27c982b6a986b (patch) | |
| tree | 9800833361010fe16a2f25a2b2e75a1b569f39f8 /lib/tpl | |
| parent | bc1e9ee1b1fffcb554afced8504270032c97341f (diff) | |
| parent | 21c9604e66bcb42ab5267e9873738a6e22250103 (diff) | |
| download | rpg-20beef63b4694afdc3d6c434c3d27c982b6a986b.tar.gz rpg-20beef63b4694afdc3d6c434c3d27c982b6a986b.tar.bz2 | |
Merge remote-tracking branch 'origin/master' into loggedin-class
Diffstat (limited to 'lib/tpl')
| -rw-r--r-- | lib/tpl/default/template.info.txt | 2 | ||||
| -rw-r--r-- | lib/tpl/dokuwiki/css/design.css | 6 | ||||
| -rw-r--r-- | lib/tpl/dokuwiki/css/mobile.css | 2 | ||||
| -rw-r--r-- | lib/tpl/dokuwiki/css/print.css | 2 | ||||
| -rw-r--r-- | lib/tpl/dokuwiki/detail.php | 2 | ||||
| -rw-r--r-- | lib/tpl/dokuwiki/main.php | 2 | ||||
| -rw-r--r-- | lib/tpl/dokuwiki/mediamanager.php | 2 | ||||
| -rw-r--r-- | lib/tpl/dokuwiki/template.info.txt | 2 |
8 files changed, 10 insertions, 10 deletions
diff --git a/lib/tpl/default/template.info.txt b/lib/tpl/default/template.info.txt index a77289e58..e0dbf54ba 100644 --- a/lib/tpl/default/template.info.txt +++ b/lib/tpl/default/template.info.txt @@ -1,7 +1,7 @@ base default author Andreas Gohr email andi@splitbrain.org -date 2012-09-08 +date 2013-02-16 name DokuWiki Default Template desc DokuWiki's default template until 2012 url http://www.dokuwiki.org/template:default diff --git a/lib/tpl/dokuwiki/css/design.css b/lib/tpl/dokuwiki/css/design.css index 2eb357a59..457414839 100644 --- a/lib/tpl/dokuwiki/css/design.css +++ b/lib/tpl/dokuwiki/css/design.css @@ -341,15 +341,15 @@ padding: .1em .35em; border-top-left-radius: 2px; border-top-right-radius: 2px; - box-shadow: 0 0 .5em #999; + box-shadow: 0 0 .5em __text_alt__; display: block; } .dokuwiki div.page { background: __background__; color: inherit; - border: 1px solid #eee; - box-shadow: 0 0 .5em #999; + border: 1px solid __background_alt__; + box-shadow: 0 0 .5em __text_alt__; border-radius: 2px; padding: 1.556em 2em 2em; margin-bottom: .5em; diff --git a/lib/tpl/dokuwiki/css/mobile.css b/lib/tpl/dokuwiki/css/mobile.css index e1d4dda72..71f80599d 100644 --- a/lib/tpl/dokuwiki/css/mobile.css +++ b/lib/tpl/dokuwiki/css/mobile.css @@ -32,7 +32,7 @@ background: __background__; color: inherit; border: 1px solid #eee; - box-shadow: 0 0 .5em #999; + box-shadow: 0 0 .5em __text_alt__; border-radius: 2px; padding: 1em; margin-bottom: .5em; diff --git a/lib/tpl/dokuwiki/css/print.css b/lib/tpl/dokuwiki/css/print.css index e0eaab848..86e686b69 100644 --- a/lib/tpl/dokuwiki/css/print.css +++ b/lib/tpl/dokuwiki/css/print.css @@ -106,7 +106,7 @@ blockquote { border: solid #ccc; border-width: 0 0 0 2pt; } -[dir=rtl] .dokuwiki blockquote { +[dir=rtl] blockquote { border-width: 0 2pt 0 0; } diff --git a/lib/tpl/dokuwiki/detail.php b/lib/tpl/dokuwiki/detail.php index f20301a89..9108504f1 100644 --- a/lib/tpl/dokuwiki/detail.php +++ b/lib/tpl/dokuwiki/detail.php @@ -9,12 +9,12 @@ // must be run from within DokuWiki if (!defined('DOKU_INC')) die(); +header('X-UA-Compatible: IE=edge,chrome=1'); ?><!DOCTYPE html> <html lang="<?php echo $conf['lang']?>" dir="<?php echo $lang['direction'] ?>" class="no-js"> <head> <meta charset="utf-8" /> - <!--[if IE]><meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" /><![endif]--> <title> <?php echo hsc(tpl_img_getTag('IPTC.Headline',$IMG))?> [<?php echo strip_tags($conf['title'])?>] diff --git a/lib/tpl/dokuwiki/main.php b/lib/tpl/dokuwiki/main.php index cd5a66ad4..d432a701e 100644 --- a/lib/tpl/dokuwiki/main.php +++ b/lib/tpl/dokuwiki/main.php @@ -9,6 +9,7 @@ */ if (!defined('DOKU_INC')) die(); /* must be run from within DokuWiki */ +header('X-UA-Compatible: IE=edge,chrome=1'); $hasSidebar = page_findnearest($conf['sidebar']); $showSidebar = $hasSidebar && ($ACT=='show'); @@ -16,7 +17,6 @@ $showSidebar = $hasSidebar && ($ACT=='show'); <html lang="<?php echo $conf['lang'] ?>" dir="<?php echo $lang['direction'] ?>" class="no-js"> <head> <meta charset="utf-8" /> - <!--[if IE]><meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" /><![endif]--> <title><?php tpl_pagetitle() ?> [<?php echo strip_tags($conf['title']) ?>]</title> <script>(function(H){H.className=H.className.replace(/\bno-js\b/,'js')})(document.documentElement)</script> <?php tpl_metaheaders() ?> diff --git a/lib/tpl/dokuwiki/mediamanager.php b/lib/tpl/dokuwiki/mediamanager.php index 23c9cee79..dadf2b10f 100644 --- a/lib/tpl/dokuwiki/mediamanager.php +++ b/lib/tpl/dokuwiki/mediamanager.php @@ -7,12 +7,12 @@ */ // must be run from within DokuWiki if (!defined('DOKU_INC')) die(); +header('X-UA-Compatible: IE=edge,chrome=1'); ?><!DOCTYPE html> <html lang="<?php echo $conf['lang']?>" dir="<?php echo $lang['direction'] ?>" class="popup no-js"> <head> <meta charset="utf-8" /> - <!--[if IE]><meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" /><![endif]--> <title> <?php echo hsc($lang['mediaselect'])?> [<?php echo strip_tags($conf['title'])?>] diff --git a/lib/tpl/dokuwiki/template.info.txt b/lib/tpl/dokuwiki/template.info.txt index d32e94d39..9d062655d 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 2012-10-26 +date 2013-05-02 name DokuWiki Template desc DokuWiki's default template since 2012 url http://www.dokuwiki.org/template:dokuwiki |