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

@ -82,7 +82,7 @@
position: relative;
display: table-cell;
background-color: @ini_background;
background-color: @ini_background_site;
border: solid 1px @wikiicons-border; // @ini_border_light;
border-radius: @ini_default_border_radius; // @ini_default_border_radius vs. @fix_border-radius
color: @ini_text_webframe;
@ -281,4 +281,4 @@
}
} // a
} // ul
} // nav-usertools
} // nav-usertools