mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-12 03:52:16 +02:00
Code Issues Projects Releases Wiki Activity

MDL-56599 theme_boost: Move region settings menu out of content div

Browse Source 
This is because the content div has it's own rules for scrolling and overflow,
and they don't work well with the action menu for the region.
This commit is contained in:
Damyon Wiese 2016-10-26 16:46:29 +08:00
parent 7eafebbcf7
commit 11774d9014
4 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -33,6 +33,19 @@ $blocks-column-width: 250px !default;
$blocks-plus-gutter: $blocks-column-width + $grid-gutter-width;
/* We put an absolutely positioned div in a relatively positioned div so it takes up no space */
#region-main-settings-menu {
position: relative;
float: left;
width: 100%;
}
#region-main-settings-menu > div {
position: absolute;
right: 0;
z-index: 100;
margin: 1rem;
}
#region-main-settings-menu.has-blocks,
#region-main.has-blocks {
display: inline-block;
width: calc(100% - #{$blocks-plus-gutter});

2
theme/boost/scss/moodle/core.scss
View File

@ -15,7 +15,7 @@
}
.context-header-settings-menu .dropdown-toggle > .icon,
.region-main-settings-menu .dropdown-toggle > .icon {
#region-main-settings-menu .dropdown-toggle > .icon {
height: 24px;
width: auto;
}

6
theme/boost/templates/columns1.mustache
View File

@ -16,11 +16,11 @@
<div id="page" class="container-fluid">
<div id="page-content" class="row">
<div id="region-main-box" class="col-xs-12">
<div id="region-main-settings-menu">
<div> {{{ output.region_main_settings_menu }}} </div>
</div>
<section id="region-main">
<div class="card card-block">
<span class="pull-xs-right region-main-settings-menu">
{{{ output.region_main_settings_menu }}}
</span>
{{{ output.course_content_header }}}
{{{ output.main_content }}}
{{{ output.course_content_footer }}}

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

@ -24,15 +24,18 @@
<section data-region="blocks-column" class="hidden-md-down">
{{{ sidepreblocks }}}
</section>
<div id="region-main-settings-menu" class="has-blocks">
<div> {{{ output.region_main_settings_menu }}} </div>
</div>
<section id="region-main" class="has-blocks">
{{/hasblocks}}
{{^hasblocks}}
<div id="region-main-settings-menu">
<div> {{{ output.region_main_settings_menu }}} </div>
</div>
<section id="region-main">
{{/hasblocks}}
<div class="card card-block">
<span class="pull-xs-right region-main-settings-menu">
{{{ output.region_main_settings_menu }}}
</span>
{{{ output.course_content_header }}}
{{{ output.main_content }}}
{{{ output.course_content_footer }}}