Merge remote-tracking branch 'origin/spis-master' into bar_search

# Conflicts:
#	css/area_content.less
#	css/area_nav-breadcrumb.less
This commit is contained in:
Jana Deutschländer 2017-01-11 15:59:24 +01:00
commit 863ddc8263
8 changed files with 135 additions and 87 deletions

View file

@ -12,6 +12,7 @@
@background_page-header: __background_page-header__;
@border-radius: __default_border_radius__;
@fix_border-radius: 2px;
@font_family_screen: __font_family_screen__;