Merge remote-tracking branch 'origin/detailView'

# Conflicts:
#	lang/de/settings.php
#	lang/en/settings.php
This commit is contained in:
Jana Deutschländer 2017-04-19 15:44:01 +02:00
commit 7b09296348
7 changed files with 495 additions and 66 deletions

View file

@ -72,7 +72,6 @@ css/area_nav-pagetools.less = all
css/area_nav-metabox.less = all
css/area_main-sidebar-nav.less = all
css/area_main-sidebar-content.less = all
;css/area_sidetools.less = all
css/area_main-content.less = all
css/area_main-content-secedit.less = all
css/area_togglelink.less = all
@ -81,7 +80,10 @@ css/area_search.less = all
css/area_tabs.less = all
css/area_recent.less = all
; ____________ template styles _____________
css/template_admin.less = all
css/template_detail.less = all
; _____________ plugin styles _____________