Merge branch 'MDL-74045-master' of https://github.com/bmbrands/moodle

admin/tool/componentlibrary/hugo/dist/css/docs.css

@@ -1088,6 +1088,21 @@
   text-decoration: none;
 }
 
+.path-admin-tool-componentlibrary #page.drawers {
+  padding-left: 0;
+  padding-right: 0;
+}
+
+.path-admin-tool-componentlibrary #page.drawers .main-inner {
+  margin: 0;
+  padding: 0;
+  border-radius: 0;
+}
+
+.path-admin-tool-componentlibrary #page.drawers div[role="main"] {
+  padding: 0;
+}
+
 .path-admin-tool-componentlibrary #page-header,
 .path-admin-tool-componentlibrary #maincontent,
 .path-admin-tool-componentlibrary .secondarynavigation {

admin/tool/componentlibrary/hugo/scss/_componentlibrary.scss

@@ -1,4 +1,16 @@
 .path-admin-tool-componentlibrary {
+    #page.drawers {
+        padding-left: 0;
+        padding-right: 0;
+        .main-inner {
+            margin: 0;
+            padding: 0;
+            border-radius: 0;
+        }
+        div[role="main"] {
+            padding: 0;
+        }
+    }
     #page-header,
     #maincontent,
     .secondarynavigation {

lib/outputrenderers.php

@@ -4998,6 +4998,10 @@ EOD;
      */
     public function addblockbutton($region = ''): string {
         $addblockbutton = '';
+        $regions = $this->page->blocks->get_regions();
+        if (count($regions) == 0) {
+            return '';
+        }
         if (isset($this->page->theme->addblockposition) &&
                 $this->page->user_is_editing() &&
                 $this->page->user_can_edit_blocks() &&

theme/boost/config.php

@@ -38,7 +38,7 @@ $THEME->scss = function($theme) {
 $THEME->layouts = [
     // Most backwards compatible layout without the blocks.
     'base' => array(
-        'file' => 'columns2.php',
+        'file' => 'drawers.php',
         'regions' => array(),
     ),
     // Standard layout with blocks.