Commit 807ba44c authored by Damyon Wiese's avatar Damyon Wiese
Browse files

Merge branch 'MDL-40790-master' of git://github.com/mihailges/moodle

Conflicts:
	theme/boost/scss/moodle/modules.scss
parents 42cec806 473391b6
......@@ -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,
......
......@@ -411,6 +411,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;
......
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment