Merge branch 'SPR-953' of gitlab.cosmocode.de:deutschlaender/sprintdoc-template into spis-master - check

This commit is contained in:
Silke Pisulla 2017-05-02 12:31:01 +02:00
commit 320fcb9f7c
2 changed files with 27 additions and 32 deletions

View file

@ -300,26 +300,6 @@
} }
/* + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* 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;
}
}
}
}
}
/* + + + + + + + + + + + + + + + + + + + + + + + + + + */ /* + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* max-width: 1023px */ /* max-width: 1023px */
@ -359,21 +339,35 @@
} }
} }
/* + + + + + + + + + + + + + + + + + + + + + + + + + + */ /* + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* max-width: 1439px */ /* max-width: 768px */
@media @screen_max-xlg { @media @screen_max-xs {
#dokuwiki__aside { body.show-mobile-sidebar {
nav { .page-wrapper > .tools {
li:not([class]), top: 2.5rem;
.li { }
font-size: @font-size-default;
* { #dokuwiki__aside {
font-size: inherit; left: 1.25rem;
font-weight: inherit; right: 1.25rem;
} width: auto;
} max-width: 100%;
margin-top: -1rem;
}
}
}
/* + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* max-width: 480px */
@media @screen_max-xxs {
body.show-mobile-sidebar {
#dokuwiki__aside {
left: 4px;
right: 4px;
} }
} }
} }

View file

@ -4,6 +4,7 @@
* @author Jana Deutschlaender <deutschlaender@cosmocode.de> * @author Jana Deutschlaender <deutschlaender@cosmocode.de>
*/ */
.search.main-sidebar { .search.main-sidebar {
@main-ico-dummy: @font-size-big + @margin-small*2; //FIXME copied from area_main-sidebar-nav @main-ico-dummy: @font-size-big + @margin-small*2; //FIXME copied from area_main-sidebar-nav
@icon-size: @page-header_height; @icon-size: @page-header_height;