mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 06:18:28 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-56630-master' of git://github.com/damyon/moodle

Browse Source
This commit is contained in:
David Monllao 2016-11-07 13:15:03 +08:00
commit b03a53576d
3 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
theme/boost/classes/output/core_renderer.php
View File

@ -606,6 +606,7 @@ class core_renderer extends \core_renderer {
if ($context->contextlevel == CONTEXT_MODULE) {
$this->page->navigation->initialise();
$node = $this->page->navigation->find_active_node();
$buildmenu = false;
// If the settings menu has been forced then show the menu.

6
theme/boost/scss/moodle/blocks.scss
View File

@ -62,3 +62,9 @@ $blocks-plus-gutter: $blocks-column-width + $grid-gutter-width;
width: 100%;
}
}
[data-region="blocks-column"] {
@include media-breakpoint-down(md) {
width: 100%;
}
}

22
theme/boost/templates/columns2.mustache
View File

@ -65,23 +65,12 @@
<div id="page-content" class="row">
<div id="region-main-box" class="col-xs-12">
{{#hasblocks}}
<section data-region="blocks-column" class="hidden-md-down">
{{{ sidepreblocks }}}
</section>
{{#hasregionmainsettingsmenu}}
<div id="region-main-settings-menu" class="has-blocks">
<div> {{{ regionmainsettingsmenu }}} </div>
</div>
{{/hasregionmainsettingsmenu}}
<section id="region-main" class="has-blocks">
{{/hasblocks}}
{{^hasblocks}}
<div id="region-main-settings-menu">
<div id="region-main-settings-menu" {{#hasblocks}}class="has-blocks"{{/hasblocks}}>
<div> {{{ output.region_main_settings_menu }}} </div>
</div>
<section id="region-main">
{{/hasblocks}}
{{/hasregionmainsettingsmenu}}
<section id="region-main" {{#hasblocks}}class="has-blocks"{{/hasblocks}}>
<div class="card card-block">
{{#hasregionmainsettingsmenu}}
<div class="region_main_settings_menu_proxy"></div>
@ -91,6 +80,11 @@
{{{ output.course_content_footer }}}
</div>
</section>
{{#hasblocks}}
<section data-region="blocks-column">
{{{ sidepreblocks }}}
</section>
{{/hasblocks}}
</div>
</div>
</div>