Merge branch 'master' into 'spis-master'

# Conflicts:
#   css/area_sidetools.less
This commit is contained in:
Jana Deutschländer 2017-01-05 17:15:37 +01:00
commit dedcbe546a
4 changed files with 98 additions and 29 deletions

View file

@ -73,7 +73,7 @@
}
p {
max-height: 200px;
max-height: 6rem;
overflow-y: auto;
background-color: @background_page-header;
border: 1px solid @color-border;
@ -169,4 +169,4 @@
}
}
}
}
}