Merge branch 'MDL-40790-33' of git://github.com/mihailges/moodle into MOODLE_33_STABLE

Conflicts:
	theme/boost/scss/moodle/modules.scss
This commit is contained in:
Damyon Wiese
2017-12-11 16:57:21 +08:00
3 changed files with 9 additions and 0 deletions
+3
View File
@@ -240,6 +240,9 @@ div#dock {
.path-mod-lesson .answeroption .checkbox label p {
display: inline;
}
#page-mod-lesson-view .branchbuttoncontainer .singlebutton button[type="submit"] {
white-space: normal;
}
.path-mod-wiki .wiki_headingtitle,
.path-mod-wiki .midpad,
@@ -459,6 +459,9 @@ div#dock {
#page-mod-lesson-view .password-form .submitbutton {
display: inline;
}
#page-mod-lesson-view .branchbuttoncontainer .singlebutton input[type="submit"] {
white-space: normal;
}
.path-mod-lesson .reviewessay {
width: 40%;
border: 1px solid #ddd;
+3
View File
@@ -17467,6 +17467,9 @@ div#dock {
#page-mod-lesson-view .password-form .submitbutton {
display: inline;
}
#page-mod-lesson-view .branchbuttoncontainer .singlebutton input[type="submit"] {
white-space: normal;
}
.path-mod-lesson .reviewessay {
width: 40%;
border: 1px solid #ddd;