show sidebar label on collapsed sidebar SPR-957

This removes the base z-indexes as they seem not to be needed (source
order defines initial heights) and interfered with the sidbar functionality.

Removing it was suggested in SPR-899 as well
This commit is contained in:
Andreas Gohr 2017-04-24 15:53:27 +02:00
commit 9e264cdc04
4 changed files with 24 additions and 23 deletions

View file

@ -84,8 +84,14 @@
} }
} }
// the wrapper around the toggle to reserve space
div.nav {
height: @icon-size + @margin-small;
border: 1px solid transparent;
}
// the toggle element // the toggle element
a.nav { div.nav a {
.display-flex(); .display-flex();
.align-items(); .align-items();
@ -156,6 +162,11 @@
color: @ini_nav_menu_hover_color; color: @ini_nav_menu_hover_color;
text-decoration: none; text-decoration: none;
// always show label, even with collapsed sidebar
position: absolute;
z-index: 100;
width: 100%;
span.ico { span.ico {
border-color: inherit; border-color: inherit;
@ -284,7 +295,6 @@
} }
} }
/* + + + + + + + + + + + + + + + + + + + + + + + + + + */ /* + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* max-width: 1439px */ /* max-width: 1439px */

View file

@ -73,16 +73,7 @@
z-index: 900; z-index: 900;
} }
.tools .row > .col-xs-12 {
z-index: 1;
}
.header .row > .col-xs-12 {
z-index: 2;
}
.content .row > .col-xs-12 { .content .row > .col-xs-12 {
z-index: 3;
border-radius: 0 @ini_default_border_radius @fix_border-radius @fix_border-radius; // @ini_default_border_radius vs. @fix_border-radius border-radius: 0 @ini_default_border_radius @fix_border-radius @fix_border-radius; // @ini_default_border_radius vs. @fix_border-radius
} }

View file

@ -48,10 +48,10 @@ jQuery(function () {
/** /**
* Toggle a navigation panel * Toggle a navigation panel
* *
* @param {jQuery} $toggler The h6 toggler * @param {jQuery} $toggler The a toggler
*/ */
toggleNav = function ($toggler) { toggleNav = function ($toggler) {
var $panel = $toggler.next('div.nav-panel'); var $panel = $toggler.parent().next('div.nav-panel');
var isOpen = $panel.is(':visible'); var isOpen = $panel.is(':visible');
// open sidebar on interaction // open sidebar on interaction
setDefaultContent(); setDefaultContent();
@ -96,7 +96,6 @@ jQuery(function () {
// make the new toggler // make the new toggler
var $toggler = jQuery('<a>') var $toggler = jQuery('<a>')
.addClass('nav')
.attr('href', '#') .attr('href', '#')
.attr('role', 'heading') .attr('role', 'heading')
.attr('aria-level', '2') .attr('aria-level', '2')
@ -105,6 +104,7 @@ jQuery(function () {
.prepend($icon) .prepend($icon)
.data('index', index) .data('index', index)
; ;
$toggler = jQuery('<div class="nav">').prepend($toggler);
// wrap all following siblings til the next element in a wrapper // wrap all following siblings til the next element in a wrapper
var $wrap = jQuery('<div>') var $wrap = jQuery('<div>')
@ -135,7 +135,7 @@ jQuery(function () {
* Initialize the open/close toggling of menu entries * Initialize the open/close toggling of menu entries
*/ */
initMenuHandling = function () { initMenuHandling = function () {
$nav.on('click', 'a.nav', function (e) { $nav.on('click', 'div.nav a', function (e) {
toggleNav(jQuery(this)); toggleNav(jQuery(this));
e.preventDefault(); e.preventDefault();
}); });

View file

@ -5,10 +5,10 @@
</nav> </nav>
<nav class="nav-sitetools"> <nav class="nav-sitetools">
<a class="nav" role="heading" aria-level="2"> <div class="nav"><a role="heading" aria-level="2">
<span class="ico"><?php echo inlineSVG(__DIR__ . '/../img/sitemap.svg') ?></span> <span class="ico"><?php echo inlineSVG(__DIR__ . '/../img/sitemap.svg') ?></span>
<span class="lbl"><?php echo $lang['site_tools']; ?></span> <span class="lbl"><?php echo $lang['site_tools']; ?></span>
</a> </a></div>
<div class="nav-panel level1"> <div class="nav-panel level1">
<ul> <ul>
<?php <?php
@ -27,10 +27,10 @@
<nav class="nav-usermenu"> <nav class="nav-usermenu">
<a class="nav" role="heading" aria-level="2"> <div class="nav"><a role="heading" aria-level="2">
<span class="ico"><?php echo inlineSVG(__DIR__ . '/../img/account-settings.svg') ?></span> <span class="ico"><?php echo inlineSVG(__DIR__ . '/../img/account-settings.svg') ?></span>
<span class="lbl"><?php echo $lang['user_tools']; ?></span> <span class="lbl"><?php echo $lang['user_tools']; ?></span>
</a> </a></div>
<div class="nav-panel level1"> <div class="nav-panel level1">
<ul> <ul>
<?php /* dokuwiki user tools */ <?php /* dokuwiki user tools */
@ -56,10 +56,10 @@ if($plugin_starred) $stars = $plugin_starred->loadStars();
if($stars): if($stars):
?> ?>
<nav class="nav-starred"> <nav class="nav-starred">
<a class="nav" role="heading" aria-level="2"> <div class="nav"><a role="heading" aria-level="2">
<span class="ico"><?php echo inlineSVG(__DIR__ . '/../img/star-circle.svg') ?></span> <span class="ico"><?php echo inlineSVG(__DIR__ . '/../img/star-circle.svg') ?></span>
<span class="lbl"><?php echo tpl_getLang('head_menu_starred'); ?></span> <span class="lbl"><?php echo tpl_getLang('head_menu_starred'); ?></span>
</a> </a></div>
<div class="nav-panel level1 plugin_starred"> <div class="nav-panel level1 plugin_starred">
<ul> <ul>
<?php <?php
@ -80,10 +80,10 @@ if($stars):
<?php if($conf['breadcrumbs']): ?> <?php if($conf['breadcrumbs']): ?>
<nav class="nav-trace"> <nav class="nav-trace">
<a class="nav" role="heading" aria-level="2"> <div class="nav"><a role="heading" aria-level="2">
<span class="ico"><?php echo inlineSVG(__DIR__ . '/../img/apple-safari.svg') ?></span> <span class="ico"><?php echo inlineSVG(__DIR__ . '/../img/apple-safari.svg') ?></span>
<span class="lbl"><?php echo tpl_getLang('head_menu_trace'); ?></span> <span class="lbl"><?php echo tpl_getLang('head_menu_trace'); ?></span>
</a> </a></div>
<div class="nav-panel level1"> <div class="nav-panel level1">
<ul> <ul>
<?php /* trace breadcrumbs as list */ <?php /* trace breadcrumbs as list */