Skip to content

Commit

Permalink
Merge branch 'MDL-63512-35' of git://github.com/peterRd/moodle into M…
Browse files Browse the repository at this point in the history
…OODLE_35_STABLE
  • Loading branch information
andrewnicols committed Dec 20, 2018
2 parents 5f2edc4 + f5065aa commit 97eac54
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 2 deletions.
12 changes: 10 additions & 2 deletions theme/bootstrapbase/less/moodle/forms.less
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,16 @@ form {
display: none;
}

.mform .fitem .fitemtitle div {
display: inline;
.mform .fitem .fitemtitle {
div {
display: inline;
}

// MDL-63512 Override to handle issues in clean where the video styling is off.
.mediaplugin,
.mediaplugin div {
display: block;
}
}
#adminsettings .error,
.loginpanel .error,
Expand Down
4 changes: 4 additions & 0 deletions theme/bootstrapbase/style/moodle.css
Original file line number Diff line number Diff line change
Expand Up @@ -16604,6 +16604,10 @@ form {
.mform .fitem .fitemtitle div {
display: inline;
}
.mform .fitem .fitemtitle .mediaplugin,
.mform .fitem .fitemtitle .mediaplugin div {
display: block;
}
#adminsettings .error,
.loginpanel .error,
.mform .error {
Expand Down

0 comments on commit 97eac54

Please sign in to comment.