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

# Conflicts:
#	css/area_sidetools.less
This commit is contained in:
Silke Pisulla 2017-01-05 15:39:15 +01:00
commit ad89b29f39
8 changed files with 64 additions and 4 deletions

View file

@ -10,6 +10,7 @@
/* + + + + + nav main + + + + + */
.nav-main {
padding-bottom: 1.8rem;
> ul {
@icon-size: 2rem;