Merge branch 'master' into 'userTasksOverlay'

# Conflicts:
#   css/area_nav-usertools.less
This commit is contained in:
Jana Deutschländer 2017-04-25 16:26:02 +02:00
commit 446069796c
21 changed files with 49 additions and 49 deletions

View file

@ -11,7 +11,7 @@ ul.page-attributes {
strong {
overflow: hidden;
background-color: @ini_background;
background-color: @ini_background_site;
border-color: @noopentasks-border;
color: @ini_text_webframe;
}