From 970bb713b3c77e62ddb27e378b5fd77aa335b136 Mon Sep 17 00:00:00 2001
From: Peter <peter@moodle.com>
Date: Tue, 9 Oct 2018 13:54:11 +0800
Subject: [PATCH] MDL-63102 core_block: Reduced spacing between blocks

Reduce the calculated bottom margin between blocks to half
---
 theme/boost/scss/moodle/blocks.scss       | 3 +++
 theme/boost/scss/moodle/core.scss         | 2 +-
 theme/boost/style/moodle.css              | 5 ++++-
 theme/boost/templates/columns2.mustache   | 2 +-
 theme/boost/templates/core/block.mustache | 2 +-
 5 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/theme/boost/scss/moodle/blocks.scss b/theme/boost/scss/moodle/blocks.scss
index 4ab424ae6580b..c56f8fd7eb0c8 100644
--- a/theme/boost/scss/moodle/blocks.scss
+++ b/theme/boost/scss/moodle/blocks.scss
@@ -63,6 +63,9 @@ $blocks-plus-gutter: $blocks-column-width + ( $grid-gutter-width / 2 );
     width: calc(100% - #{$blocks-plus-gutter});
     @include media-breakpoint-down(lg) {
         width: 100%;
+        /* MDL-63102 - Remove extra space at bottom.
+        If modifying make sure block-region is horizontally stacked when in full screen */
+        display: block;
     }
 }
 
diff --git a/theme/boost/scss/moodle/core.scss b/theme/boost/scss/moodle/core.scss
index 52b02fb4f9b3f..4a45d637ea9f6 100644
--- a/theme/boost/scss/moodle/core.scss
+++ b/theme/boost/scss/moodle/core.scss
@@ -2140,4 +2140,4 @@ div.editor_atto_toolbar button .icon {
     .dir-ltr-hide {
         display: none;
     }
-}
\ No newline at end of file
+}
diff --git a/theme/boost/style/moodle.css b/theme/boost/style/moodle.css
index b0f897b2d1753..569c981f6dd50 100644
--- a/theme/boost/style/moodle.css
+++ b/theme/boost/style/moodle.css
@@ -11118,7 +11118,10 @@ div.editor_atto_toolbar button .icon {
   @media (max-width: 1199.98px) {
     #region-main-settings-menu.has-blocks,
     #region-main.has-blocks {
-      width: 100%; } }
+      width: 100%;
+      /* MDL-63102 - Remove extra space at bottom.
+        If modifying make sure block-region is horizontally stacked when in full screen */
+      display: block; } }
 
 @media (max-width: 1199.98px) {
   [data-region="blocks-column"] {
diff --git a/theme/boost/templates/columns2.mustache b/theme/boost/templates/columns2.mustache
index 704705521933b..4ff79b6e57cfa 100644
--- a/theme/boost/templates/columns2.mustache
+++ b/theme/boost/templates/columns2.mustache
@@ -68,7 +68,7 @@
                     <div> {{{ output.region_main_settings_menu }}} </div>
                 </div>
                 {{/hasregionmainsettingsmenu}}
-                <section id="region-main" {{#hasblocks}}class="has-blocks mb-3"{{/hasblocks}}>
+                <section id="region-main" {{#hasblocks}}class="has-blocks mb-2"{{/hasblocks}}>
 
                     {{#hasregionmainsettingsmenu}}
                         <div class="region_main_settings_menu_proxy"></div>
diff --git a/theme/boost/templates/core/block.mustache b/theme/boost/templates/core/block.mustache
index 8eb1abbd8996d..7123185031241 100644
--- a/theme/boost/templates/core/block.mustache
+++ b/theme/boost/templates/core/block.mustache
@@ -20,7 +20,7 @@
 
 {{! Start Block Container }}
 <section id="{{id}}"
-     class="{{#hidden}}hidden{{/hidden}} block block_{{type}} {{#hascontrols}}block_with_controls{{/hascontrols}} card mb-3"
+     class="{{#hidden}}hidden{{/hidden}} block block_{{type}} {{#hascontrols}}block_with_controls{{/hascontrols}} card mb-2"
      role="{{ariarole}}"
      data-block="{{type}}"
      {{#arialabel}}