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

This commit is contained in:
Eloy Lafuente (stronk7) 2018-10-15 23:34:45 +02:00
commit 12752c72d1
5 changed files with 10 additions and 4 deletions

View File

@ -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;
}
}

View File

@ -2148,4 +2148,4 @@ div.editor_atto_toolbar button .icon {
.dir-ltr-hide {
display: none;
}
}
}

View File

@ -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"] {

View File

@ -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>

View File

@ -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}}