adrian/tcm-in-guestrow-tpl
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

made sidebar content styles re-usable outside of ID (added class: aside)

Browse source
This commit is contained in:
Anika Henke 2014-04-06 19:19:35 +01:00
parent 0893938a32
commit e4cfe7748c
2 changed files with 24 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

46
css/design.css
View file

@ -169,55 +169,55 @@
#dokuwiki__aside { #dokuwiki__aside {
padding-top: .4em; padding-top: .4em;
line-height: 1.2;
} }
#dokuwiki__aside > .pad { .dokuwiki .aside {
overflow: hidden; overflow: hidden;
word-wrap: break-word; word-wrap: break-word;
line-height: 1.2;
} }
/* make sidebar more condensed */ /* make sidebar more condensed */
#dokuwiki__aside h1 { .dokuwiki .aside h1 {
margin-bottom: .222em; margin-bottom: .222em;
} }
#dokuwiki__aside h2 { .dokuwiki .aside h2 {
margin-bottom: .333em; margin-bottom: .333em;
} }
#dokuwiki__aside h3 { .dokuwiki .aside h3 {
margin-bottom: .444em; margin-bottom: .444em;
} }
#dokuwiki__aside h4 { .dokuwiki .aside h4 {
margin-bottom: .5em; margin-bottom: .5em;
} }
#dokuwiki__aside h5 { .dokuwiki .aside h5 {
margin-bottom: .5714em; margin-bottom: .5714em;
} }
#dokuwiki__aside p, .dokuwiki .aside p,
#dokuwiki__aside ul, .dokuwiki .aside ul,
#dokuwiki__aside ol, .dokuwiki .aside ol,
#dokuwiki__aside dl, .dokuwiki .aside dl,
#dokuwiki__aside pre, .dokuwiki .aside pre,
#dokuwiki__aside table, .dokuwiki .aside table,
#dokuwiki__aside fieldset, .dokuwiki .aside fieldset,
#dokuwiki__aside hr, .dokuwiki .aside hr,
#dokuwiki__aside blockquote, .dokuwiki .aside blockquote,
#dokuwiki__aside address { .dokuwiki .aside address {
margin-bottom: .7em; margin-bottom: .7em;
} }
#dokuwiki__aside ul, .dokuwiki .aside ul,
#dokuwiki__aside ol { .dokuwiki .aside ol {
padding-left: .5em; padding-left: .5em;
} }
[dir=rtl] #dokuwiki__aside ul, [dir=rtl] .dokuwiki .aside ul,
[dir=rtl] #dokuwiki__aside ol { [dir=rtl] .dokuwiki .aside ol {
padding-right: .5em; padding-right: .5em;
} }
#dokuwiki__aside li ul, .dokuwiki .aside li ul,
#dokuwiki__aside li ol { .dokuwiki .aside li ol {
margin-bottom: 0; margin-bottom: 0;
padding: 0; padding: 0;
} }

2
main.php
View file

@ -117,7 +117,7 @@ $showSidebar = page_findnearest($conf['sidebar']) && ($ACT=='show');
<!-- ********** ASIDE ********** --> <!-- ********** ASIDE ********** -->
<?php if ($showSidebar): ?> <?php if ($showSidebar): ?>
<div id="dokuwiki__aside"><div class="pad include"> <div id="dokuwiki__aside"><div class="pad aside include group">
<?php tpl_includeFile('sidebarheader.html') ?> <?php tpl_includeFile('sidebarheader.html') ?>
<?php tpl_include_page($conf['sidebar'], 1, 1) /* includes the nearest sidebar page */ ?> <?php tpl_include_page($conf['sidebar'], 1, 1) /* includes the nearest sidebar page */ ?>
<?php tpl_includeFile('sidebarfooter.html') ?> <?php tpl_includeFile('sidebarfooter.html') ?>