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

This commit is contained in:
Andrew Nicols 2018-10-29 14:42:09 +08:00
commit fca51b97ed
2 changed files with 3 additions and 3 deletions

View File

@ -25,7 +25,7 @@
}
}
$blocks-column-width: 250px !default;
$blocks-column-width: 360px !default;
[data-region="blocks-column"] {
width: $blocks-column-width;

View File

@ -11094,7 +11094,7 @@ div.editor_atto_toolbar button .icon {
color: #373a3c; }
[data-region="blocks-column"] {
width: 250px;
width: 360px;
float: right; }
/* We put an absolutely positioned div in a relatively positioned div so it takes up no space */
@ -11121,7 +11121,7 @@ div.editor_atto_toolbar button .icon {
#region-main-settings-menu.has-blocks,
#region-main.has-blocks {
display: inline-block;
width: calc(100% - 265px); }
width: calc(100% - 375px); }
@media (max-width: 1199.98px) {
#region-main-settings-menu.has-blocks,
#region-main.has-blocks {