Merge branch 'MDL-62051-master' of git://github.com/bmbrands/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 9 May 2018 02:01:17 +0000 (10:01 +0800)
committerJun Pataleta <jun@moodle.com>
Thu, 10 May 2018 01:15:46 +0000 (09:15 +0800)
1  2 
theme/boost/scss/moodle/bs4alphacompat.scss
theme/boost/scss/moodle/forms.scss
theme/boost/scss/moodle/undo.scss

@@@ -422,7 -420,21 +420,26 @@@ textarea[data-auto-rows] 
      display: block;
  }
  
- }
 +// Show editor at 100% width by default.
 +[data-fieldtype="editor"] > div {
 +    flex-grow: 1;
++}
++
+ @include media-breakpoint-up(sm) {
+     .mform fieldset {
+         margin-left: $spacer * 1.5;
+     }
+     .mform fieldset.collapsible legend a.fheader {
+         padding: 0 5px 0 ($spacer * 1.5);
+         margin-left: -($spacer * 1.5);
+         background: url([[pix:t/expanded]]) 0 center no-repeat;
+     }
+     .mform fieldset.collapsed legend a.fheader {
+         /*rtl:raw:
+         background-image: url([[pix:t/collapsed_rtl]]);
+         */
+         /*rtl:remove*/
+         background-image: url([[pix:t/collapsed]]);
+     }
+ }
Simple merge