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

# Conflicts:
#	css/area_content.less
#	css/area_nav-breadcrumb.less
#	css/area_nav-metabox.less
#	css/area_sidetools.less
#	css/base_design.less
This commit is contained in:
Silke Pisulla 2017-01-11 15:44:24 +01:00
commit 555efed804
25 changed files with 657 additions and 630 deletions

View file

@ -10,7 +10,7 @@
position: absolute;
top: -1px;
bottom: -1px;
left: -2rem;
left: -(@margin-default);
z-index: 1;
a {
@ -18,7 +18,7 @@
.flex-direction();
.justify-content();
width: 2rem;
width: (@margin-default);
height: 100%;
background-color: @button_background;
border: solid 1px @button_background;