diff options
| -rwxr-xr-x | css/_toc.css | 2 | ||||
| -rwxr-xr-x | css/design.css | 30 | ||||
| -rw-r--r-- | images/logo.png | bin | 0 -> 12212 bytes | |||
| -rwxr-xr-x | main.php | 13 |
4 files changed, 38 insertions, 7 deletions
diff --git a/css/_toc.css b/css/_toc.css index 0213a1829..1462eb83f 100755 --- a/css/_toc.css +++ b/css/_toc.css @@ -15,6 +15,8 @@ width: __sidebar_width__; font-size: 0.9em; border-left: 1px solid __border__; + background: __background__; + color: inherit; } /*____________ toc header ____________*/ diff --git a/css/design.css b/css/design.css index f1285aae9..8111091fd 100755 --- a/css/design.css +++ b/css/design.css @@ -17,6 +17,15 @@ #dokuwiki__header .headings, #dokuwiki__header .tools { margin-bottom: 1em; + width: 50%; +} +#dokuwiki__header h1 img { + float: left; + margin-right: .5em; +} +#dokuwiki__header h1 span { + display: block; + padding-top: 10px; } #dokuwiki__header h1 { margin-bottom: 0; @@ -234,6 +243,19 @@ margin-bottom: .5em; font-size: 0.875em; } +/* alternative: +.dokuwiki div.breadcrumbs { + border-top: 1px solid __border__; + border-bottom: 1px solid __background__; + margin-bottom: .5em; + font-size: 0.875em; +} +.dokuwiki div.breadcrumbs div { + border-top: 1px solid __background__; + border-bottom: 1px solid __border__; + padding: .1em .35em; +} +*/ .dokuwiki div.breadcrumbs a { color: __link__; background-color: inherit; @@ -271,6 +293,12 @@ margin-bottom: 0; } +#dokuwiki__aside a:link, +#dokuwiki__aside a:visited { + color: __link__; + background-color: inherit; +} + /* content ********************************************************************/ @@ -289,7 +317,7 @@ border-top-right-radius: 2px; } -.dokuwiki .page { +.dokuwiki div.page { background: __background__; color: inherit; border: 1px solid #eee; diff --git a/images/logo.png b/images/logo.png Binary files differnew file mode 100644 index 000000000..8b794dd64 --- /dev/null +++ b/images/logo.png @@ -38,10 +38,11 @@ $showTools = !tpl_getConf('hideTools') || ( tpl_getConf('hideTools') && $_SERVER <div id="dokuwiki__header"><div class="pad"> <div class="headings"> - <h1><?php tpl_link(wl(),$conf['title'],'id="dokuwiki__top" accesskey="h" title="[H]"') ?></h1> - <?php /* how to insert logo instead (if no CSS image replacement technique is used): - upload your logo into the data/media folder (root of the media manager) and replace 'logo.png' accordingly: - tpl_link(wl(),'<img src="'.ml('logo.png').'" alt="'.$conf['title'].'" />','id="dokuwiki__top" accesskey="h" title="[H]"') */ ?> + <h1><?php tpl_link( + wl(), + '<img src="'.tpl_getFavicon(false, 'logo.png').'" alt="" /> <span>'.$conf['title'].'</span>', + 'id="dokuwiki__top" accesskey="h" title="[H]"' + ) /* @todo: obviously don't use tpl_getFavicon, but make a new function (or use a config option?) */ ?></h1> <?php if (tpl_getConf('tagline')): ?> <p class="claim"><?php echo tpl_getConf('tagline') ?></p> <?php endif ?> @@ -93,10 +94,10 @@ $showTools = !tpl_getConf('hideTools') || ( tpl_getConf('hideTools') && $_SERVER <!-- BREADCRUMBS --> <?php if($conf['breadcrumbs']){ ?> - <div class="tracking breadcrumbs"><?php tpl_breadcrumbs() ?></div> + <div class="tracking breadcrumbs"><div><?php tpl_breadcrumbs() ?></div></div> <?php } ?> <?php if($conf['youarehere']){ ?> - <div class="hierarchical breadcrumbs"><?php tpl_youarehere() ?></div> + <div class="hierarchical breadcrumbs"><div><?php tpl_youarehere() ?></div></div> <?php } ?> <hr class="a11y" /> |
