diff options
| author | Andreas Gohr <andi@splitbrain.org> | 2015-02-24 10:16:22 +0100 |
|---|---|---|
| committer | Andreas Gohr <andi@splitbrain.org> | 2015-02-24 10:16:22 +0100 |
| commit | 809448f525b31b791cfbb57255354c14c6a009a2 (patch) | |
| tree | fc2afd87394e4fbc125dbece54374c66930fbe48 /lib/tpl | |
| parent | 15a61525c6586054213c7f64cc6e686d7dc8eed0 (diff) | |
| parent | 30c466355a6686ac20edc1f23d87a3a8c8ec6081 (diff) | |
| download | rpg-809448f525b31b791cfbb57255354c14c6a009a2.tar.gz rpg-809448f525b31b791cfbb57255354c14c6a009a2.tar.bz2 | |
Merge pull request #1027 from splitbrain/issue-1011
avoid messages pushing down page tools. fixes #1011
Diffstat (limited to 'lib/tpl')
| -rw-r--r-- | lib/tpl/dokuwiki/css/design.less | 15 | ||||
| -rw-r--r-- | lib/tpl/dokuwiki/detail.php | 1 | ||||
| -rw-r--r-- | lib/tpl/dokuwiki/main.php | 1 | ||||
| -rw-r--r-- | lib/tpl/dokuwiki/tpl_header.php | 2 |
4 files changed, 12 insertions, 7 deletions
diff --git a/lib/tpl/dokuwiki/css/design.less b/lib/tpl/dokuwiki/css/design.less index 66607b5e9..548ba7228 100644 --- a/lib/tpl/dokuwiki/css/design.less +++ b/lib/tpl/dokuwiki/css/design.less @@ -349,11 +349,12 @@ form.search { ********************************************************************/ .dokuwiki .pageId { - position: absolute; - top: -2.3em; - right: -1em; + float: right; + margin-right: -1em; + margin-bottom: -1px; + margin-top: -1.5em; overflow: hidden; - padding: 1em 1em 0; + padding: 0.5em 1em 0; span { font-size: 0.875em; @@ -370,6 +371,7 @@ form.search { } .dokuwiki div.page { + clear: both; background: @ini_background; color: inherit; border: 1px solid @ini_background_alt; @@ -396,8 +398,9 @@ form.search { } [dir=rtl] .dokuwiki .pageId { - right: auto; - left: -1em; + float: left; + margin-left: -1em; + margin-right: 0; } /* footer diff --git a/lib/tpl/dokuwiki/detail.php b/lib/tpl/dokuwiki/detail.php index d4f9c39d1..b27567987 100644 --- a/lib/tpl/dokuwiki/detail.php +++ b/lib/tpl/dokuwiki/detail.php @@ -36,6 +36,7 @@ header('X-UA-Compatible: IE=edge,chrome=1'); <!-- ********** CONTENT ********** --> <div id="dokuwiki__content"><div class="pad group"> + <?php html_msgarea() ?> <?php if(!$ERROR): ?> <div class="pageId"><span><?php echo hsc(tpl_img_getTag('IPTC.Headline',$IMG)); ?></span></div> diff --git a/lib/tpl/dokuwiki/main.php b/lib/tpl/dokuwiki/main.php index 10c0bf91e..165230e8a 100644 --- a/lib/tpl/dokuwiki/main.php +++ b/lib/tpl/dokuwiki/main.php @@ -49,6 +49,7 @@ $showSidebar = $hasSidebar && ($ACT=='show'); <!-- ********** CONTENT ********** --> <div id="dokuwiki__content"><div class="pad group"> + <?php html_msgarea() ?> <div class="pageId"><span><?php echo hsc($ID) ?></span></div> diff --git a/lib/tpl/dokuwiki/tpl_header.php b/lib/tpl/dokuwiki/tpl_header.php index 7d9c88347..ee51cbd01 100644 --- a/lib/tpl/dokuwiki/tpl_header.php +++ b/lib/tpl/dokuwiki/tpl_header.php @@ -85,7 +85,7 @@ if (!defined('DOKU_INC')) die(); </div> <?php endif ?> - <?php html_msgarea() ?> + <hr class="a11y" /> </div></div><!-- /header --> |