Merge branch '2.1'

Conflicts:
	composer.json

DependencyInjection/SonataAdminExtension.php

@@ -146,9 +146,6 @@ class SonataAdminExtension extends Extension
             "Sonata\\AdminBundle\\Builder\\ListBuilderInterface",
             "Sonata\\AdminBundle\\Builder\\RouteBuilderInterface",
             "Sonata\\AdminBundle\\Builder\\ShowBuilderInterface",
-            "Sonata\\AdminBundle\\Controller\\CoreController",
-            "Sonata\\AdminBundle\\Controller\\CRUDController",
-            "Sonata\\AdminBundle\\Controller\\HelperController",
             "Sonata\\AdminBundle\\Datagrid\\Datagrid",
             "Sonata\\AdminBundle\\Datagrid\\DatagridInterface",
             "Sonata\\AdminBundle\\Datagrid\\DatagridMapper",

Resources/public/base.js

@@ -1,7 +1,7 @@
 jQuery(document).ready(function() {
     jQuery('html').removeClass('no-js');
     Admin.add_pretty_errors(document);
-    Admin.add_collapsed_toggle();
+    Admin.add_collapsed_toggle(document);
     Admin.add_filters(document);
     Admin.set_object_field_value(document);
     Admin.setup_collection_buttons(document);

Resources/public/css/layout.css

@@ -1,6 +1,10 @@
-@media (min-width: 979px) {
+body.sonata-bc {
+    padding-top: 60px;
+}
+
+@media (max-width: 978px) {
     body.sonata-bc {
-        padding-top: 60px;
+        padding-top: 0;
     }
 }