From 320fcb9f7c974e6672cbd180abd7cdbdc9de026e Mon Sep 17 00:00:00 2001 From: Silke Pisulla Date: Tue, 2 May 2017 12:31:01 +0200 Subject: [PATCH] Merge branch 'SPR-953' of gitlab.cosmocode.de:deutschlaender/sprintdoc-template into spis-master - check --- css/area_main-sidebar-nav.less | 58 ++++++++++++++----------------- css/area_main-sidebar-search.less | 1 + 2 files changed, 27 insertions(+), 32 deletions(-) diff --git a/css/area_main-sidebar-nav.less b/css/area_main-sidebar-nav.less index f5b4eea..143f232 100755 --- a/css/area_main-sidebar-nav.less +++ b/css/area_main-sidebar-nav.less @@ -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 */ @@ -359,21 +339,35 @@ } } + /* + + + + + + + + + + + + + + + + + + + + + + + + + + */ -/* max-width: 1439px */ +/* max-width: 768px */ -@media @screen_max-xlg { - #dokuwiki__aside { - nav { - li:not([class]), - .li { - font-size: @font-size-default; +@media @screen_max-xs { + body.show-mobile-sidebar { + .page-wrapper > .tools { + top: 2.5rem; + } - * { - font-size: inherit; - font-weight: inherit; - } - } + #dokuwiki__aside { + left: 1.25rem; + 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; } } } diff --git a/css/area_main-sidebar-search.less b/css/area_main-sidebar-search.less index 70987bf..d92cedd 100644 --- a/css/area_main-sidebar-search.less +++ b/css/area_main-sidebar-search.less @@ -4,6 +4,7 @@ * @author Jana Deutschlaender */ + .search.main-sidebar { @main-ico-dummy: @font-size-big + @margin-small*2; //FIXME copied from area_main-sidebar-nav @icon-size: @page-header_height;