Merge remote-tracking branch 'origin/title'

This commit is contained in:
Jana Deutschländer 2017-04-26 17:48:39 +02:00
commit 4a0e15e1d3
4 changed files with 48 additions and 33 deletions

View file

@ -62,8 +62,14 @@
}
}
// the wrapper around the toggle to reserve space
div.nav {
height: @icon-size + @margin-small;
border: 1px solid transparent;
}
// the toggle element
a.nav {
div.nav a {
.display-flex();
.align-items();
@ -145,6 +151,11 @@
color: @ini_nav_menu_hover_color;
text-decoration: none;
// always show label, even with collapsed sidebar
position: absolute;
z-index: 100;
width: 100%;
span.ico {
border-color: inherit;
@ -293,3 +304,23 @@
}
}
}
/* + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* max-width: 1439px */
@media @screen_max-xlg {
#dokuwiki__aside {
nav {
li:not([class]),
.li {
font-size: @font-size-default;
* {
font-size: inherit;
font-weight: inherit;
}
}
}
}
}

View file

@ -73,23 +73,7 @@
z-index: 900;
}
/* if z-index is needed for .tools col, then use this:
.tools .row > .col-xs-12 {
z-index: 5; // SPR-945 sometimes too small space for suggestionlist
}
.wide-content .tools .row > .col-xs-12 {
z-index: 1;
}
*/
.header .row > .col-xs-12 {
z-index: 2;
}
.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
}