From 79a31340a8b0dcdbe7a759a993b3b7268c278b68 Mon Sep 17 00:00:00 2001 From: luxick Date: Fri, 6 Mar 2026 09:34:09 +0100 Subject: [PATCH] Update Logo rendering --- css/design.less | 63 +++++++++++----------- css/mobile.less | 3 +- css/print.css | 1 - detail.php | 4 -- images/logo.png | Bin 3744 -> 0 bytes images/logo.svg | 1 + main.php | 2 - script.js | 24 +++++++++ tpl_header.php | 138 +++++++++++++++++++++++++++--------------------- 9 files changed, 137 insertions(+), 99 deletions(-) delete mode 100755 images/logo.png create mode 100644 images/logo.svg diff --git a/css/design.less b/css/design.less index e72d485..eca7da9 100755 --- a/css/design.less +++ b/css/design.less @@ -59,6 +59,21 @@ width: auto; } + .logo__image { + display: inline-flex; + align-items: center; + justify-content: center; + height: 1.5em; + width: 1.5em; + color: @ini_theme_color; + + svg { + display: block; + width: 100%; + height: 100%; + } + } + span { display: block; } @@ -76,6 +91,11 @@ margin-right: 0; } +[dir=rtl] #dokuwiki__header .logo .logo__image { + margin-left: 0; + margin-right: 0; +} + /* tools ********************************************************************/ @@ -139,7 +159,7 @@ } > form.search input { - width: 14em; + width: 24em; max-width: 100%; height: 24px; margin: 0; @@ -262,9 +282,11 @@ form.search { display: none; } - summary span { - font-size: 18px; - line-height: 1; + summary svg { + width: 16px; + height: 16px; + display: block; + fill: @ini_icons; } &[open] summary, @@ -273,6 +295,12 @@ form.search { border-color: @ini_link; color: @ini_link; } + + &[open] summary svg, + summary:hover svg, + summary:focus svg { + fill: @ini_link; + } } .header__menu-panel { @@ -398,27 +426,6 @@ form.search { /* content ********************************************************************/ -.dokuwiki .pageId { - float: right; - margin-right: -1em; - margin-bottom: -1px; - margin-top: 0; - overflow: hidden; - padding: 0 1em 0; - - span { - font-size: 0.875em; - border: solid @ini_border; - border-width: 1px 1px 0; - background-color: @ini_background; - color: @ini_text_alt; - padding: .1em .35em; - border-top-left-radius: 2px; - border-top-right-radius: 2px; - display: block; - } -} - .dokuwiki div.page { clear: both; background: @ini_background; @@ -446,12 +453,6 @@ form.search { text-align: left; } -[dir=rtl] .dokuwiki .pageId { - float: left; - margin-left: -1em; - margin-right: 0; -} - /* footer ********************************************************************/ diff --git a/css/mobile.less b/css/mobile.less index 8c2356b..e44c847 100755 --- a/css/mobile.less +++ b/css/mobile.less @@ -228,8 +228,7 @@ body { #dokuwiki__usertools, #dokuwiki__sitetools ul, #dokuwiki__sitetools h3, -.dokuwiki div.breadcrumbs, /* @todo: maybe move breadcrumbs to the bottom? */ -.dokuwiki .pageId { +.dokuwiki div.breadcrumbs { /* @todo: maybe move breadcrumbs to the bottom? */ display: none; } diff --git a/css/print.css b/css/print.css index dd5d71b..9081525 100755 --- a/css/print.css +++ b/css/print.css @@ -17,7 +17,6 @@ video, #dokuwiki__header .tools, #dokuwiki__aside, .dokuwiki .breadcrumbs, -.dokuwiki .pageId, #dw__toc, h3.toggle, #dokuwiki__pagetools, diff --git a/detail.php b/detail.php index c7daf9e..1536a86 100755 --- a/detail.php +++ b/detail.php @@ -35,10 +35,6 @@ if (!defined('DOKU_INC')) die();
- -
- -
diff --git a/images/logo.png b/images/logo.png deleted file mode 100755 index a1f4995691b91ac58ad41c46f1279b2194000c5c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3744 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 KMNUMnLSTZihC~+t diff --git a/images/logo.svg b/images/logo.svg new file mode 100644 index 0000000..15d7761 --- /dev/null +++ b/images/logo.svg @@ -0,0 +1 @@ + diff --git a/main.php b/main.php index 7f7235a..8cfcbb5 100755 --- a/main.php +++ b/main.php @@ -49,8 +49,6 @@ $showSidebar = $hasSidebar && ($ACT == 'show');

-
-
diff --git a/script.js b/script.js index f7bf646..9917eac 100755 --- a/script.js +++ b/script.js @@ -87,6 +87,30 @@ jQuery(function(){ this.blur(); }); + (function enhanceHeaderMenu(){ + var $menu = jQuery('#dokuwiki__header .header__menu'); + + if ($menu.length === 0) { + return; + } + + function closeMenu() { + $menu.removeAttr('open'); + } + + jQuery(document).on('click', function (event) { + if (!jQuery(event.target).closest($menu).length) { + closeMenu(); + } + }); + + jQuery(document).on('keydown', function (event) { + if (event.key === 'Escape') { + closeMenu(); + } + }); + })(); + // make edit toolbar icons themeable by converting img icons to CSS masks (function enhanceEditToolbarIcons() { function toMaskIcons() { diff --git a/tpl_header.php b/tpl_header.php index 7025d19..459d822 100755 --- a/tpl_header.php +++ b/tpl_header.php @@ -6,6 +6,23 @@ // must be run from within DokuWiki if (!defined('DOKU_INC')) die(); + +$siteToolsHtml = (new \dokuwiki\Menu\SiteMenu())->getListItems('action '); +$userToolsHtml = ''; +if ($conf['useacl']) { + $userToolsHtml = (new \dokuwiki\Menu\UserMenu())->getListItems('action '); +} + +$breadcrumbsHtml = ''; +if ($conf['youarehere']) { + $breadcrumbsHtml = tpl_youarehere(null, true); +} +if (!$breadcrumbsHtml && $conf['breadcrumbs']) { + $breadcrumbsHtml = tpl_breadcrumbs(null, true); +} + +$templateLogoUrl = tpl_basedir() . 'images/logo.svg'; +$templateLogoPath = DOKU_TPLINC . 'images/logo.svg'; ?> @@ -13,76 +30,79 @@ if (!defined('DOKU_INC')) die(); -
-
    -
    • -
+
    +
    • +
-

+
+

' . - '' . $conf['title'] . '', - 'accesskey="h" title="' . tpl_getLang('home') . ' [h]"' - ); - ?>

- -

- -
+ if ($logo === $templateLogoUrl) { + $logoMarkup = ''; + } else { + $logoMarkup = ''; + } -
- - -
-

-
    - '; - tpl_userinfo(); /* 'Logged in as ...' */ - echo ''; - } - echo (new \dokuwiki\Menu\UserMenu())->getListItems('action '); - ?> -
-
- + tpl_link( + wl(), + $logoMarkup . + '' . $conf['title'] . '', + 'accesskey="h" title="' . tpl_getLang('home') . ' [h]"' + ); + ?>

- -
+ +
+ +
+ +

+ + +
+ + + + +
+ +
    + +
+ + + + + + + +
+

+
    + +
+
+ +
+
+ +
getDropdown($lang['tools']); ?>
-
    - getListItems('action '); ?> -
-
- - -
- -
- - -
- -
- -