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

# Conflicts:
#	css/plugins/do_tasks.less
This commit is contained in:
Silke Pisulla 2017-05-11 15:18:51 +02:00
commit 4a2396d1fd
17 changed files with 194 additions and 27 deletions

View file

@ -125,7 +125,6 @@
&:focus,
&:active {
position: relative; // always show label, even with collapsed sidebar
z-index: 100;
width: 100%;
background-color: @ini_nav_menu_hover_bg;
border-color: @ini_nav_menu_hover_color;
@ -323,7 +322,6 @@
display: block !important;
position: absolute;
left: 1.25rem; // left margin of content container
z-index: 200; // above all
box-shadow: @box-shadow-right-bottom;
min-width: 45%;
max-width: 90%;
@ -332,7 +330,6 @@
> nav {
position: relative;
z-index: 2;
&:first-child {
margin-top: 1.2rem;