EH22/dokuwiki-template-sprintdoc-modified
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into title

Browse source 
* master:
  Adjust less vars for compatibility
  Use do-plugin's user task button w/ overlay
  SPR-937: comment
  SPR-958: Scrollbars im meta-footer (bdi)
  SPR-958: Scrollbars im meta-footer (bdi)
  SPR-950: optimate Headerstyling in Mobile
  SPR-950: mobile - magicmatcher additional class makes wrong padding in usertoolicons
  SPR-945: min-width for quicksearch qs wide-screen
  SPR-950: optimate Headerstyling in Mobile
  SPR-945: min-width for quicksearch qs wide-screen
  SPR-945: min-width for quicksearch qs wide-screen
  SPR-945: min-width for quicksearch qs wide-screen
  SPR-942: sublist less indent; SPR-945: min-width for quicksearch
  SPR-942: sublist alignment in sidebar; SPR-953: nav active
  SPR-942: sublist less indent
  SPR-908: qs old data plugin (edit button for table)
  SPR-908: check fix border-radius
  SPR-937: Alignment Sidebar
This commit is contained in:
Andreas Gohr 2017-04-26 11:54:19 +02:00
commit 146503ce08
29 changed files with 351 additions and 159 deletions
Download patch file Download diff file Expand all files Collapse all files

49
css/area_main-sidebar-nav.less
View file

@ -8,7 +8,7 @@
#dokuwiki__aside {
@icon-size: @font-size-big;
@menu-margin: @icon-size + @margin-small*2; // FIXME this is still wrong
@menu-margin: @icon-size + @margin-small * 2;
nav > p,
.mmissuelist li,
@ -37,6 +37,11 @@
margin-left: 0;
}
}
li:not([class]),
.li {
padding: .15em 0;
}
}
@ -70,6 +75,10 @@
> * {
margin-left: @menu-margin; // moves *all* sidebar content to the right
@media @screen_md-lg {
margin-left: @menu-margin-lg;
}
}
a {
@ -96,16 +105,20 @@
.align-items();
cursor: pointer;
height: @icon-size + @margin-small;
min-height: @icon-size + @margin-small;
opacity: 1;
border: 1px solid transparent;
border-radius: @fix_border-radius;
color: @ini_nav_menu_color;
font-size: @font-size-head6;
font-weight: normal;
margin: -1px 0 (@font-size-head6 / 2) (@menu-margin * -1); // moves the toggles back to the left
margin: -1px 0 (@font-size-head6 / 2) -(@menu-margin - .4); // moves the toggles back to the left (.4 from li margin)
transition: @transition color, @transition background-color, @transition border-color;
@media @screen_md-lg {
margin-left: -(@menu-margin-lg + .8);
}
span {
display: inline-block;
vertical-align: middle;
@ -114,12 +127,20 @@
span.lbl {
flex-grow: 1;
// wordbreak too late in IE 10
@media screen and (-ms-high-contrast: active), (-ms-high-contrast: none) {
width: 100%;
box-sizing: border-box;
padding-right: 13px;
}
}
span.ico {
.flex(0 0 auto);
width: @menu-margin;
height: @icon-size;
flex-grow: 0;
border-right: 1px solid @ini_nav_menu_color;
text-align: center;
margin-right: 4%;
@ -183,7 +204,23 @@
}
}
// the panel (hidden by default)
// without wrapping UL
nav > a.nav {
margin-left: -3.5rem;
@media @screen_md-lg {
margin-left: -2.5rem;
}
}
/* + + + + + active + + + + + */
span.curid a {
font-weight: bold;
}
/* + + + + + the panel (hidden by default) + + + + + */
div.nav-panel {
display: none;
margin-top: .5rem;
@ -236,7 +273,6 @@
li:not([class]),
.li {
font-size: @font-size-head6;
padding: .15em 0;
* {
font-size: inherit;
@ -304,7 +340,6 @@
li:not([class]),
.li {
font-size: @font-size-default;
padding: .15em 0 .15em .25rem;
* {
font-size: inherit;