Merge branch 'MDL-63102-master' of git://github.com/peterRd/moodle

moodle · Oct 15, 2018 · 12752c7 · 12752c7
2 parents 77d7f5e + 970bb71
commit 12752c7
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 4 deletions.
diff --git 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
@@ -2148,4 +2148,4 @@ div.editor_atto_toolbar button .icon {
     .dir-ltr-hide {
         display: none;
     }
-}
+}
diff --git a/theme/boost/style/moodle.css b/theme/boost/style/moodle.css
@@ -11125,7 +11125,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
@@ -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
@@ -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}}