Merge branch 'wip-MDL-39499-master' of git://github.com/ds125v/moodle

Conflicts: theme/bootstrapbase/style/moodle.css
2025-01-19 06:18:28 +01:00 · 2013-05-07 17:11:28 +12:00 · 2013-05-07 17:11:28 +12:00 · e4e8d577cd
commit e4e8d577cd
parent 98b2443961 c57a883080
2 changed files with 5 additions and 1 deletions
--- a/theme/bootstrapbase/less/moodle/buttons.less
+++ b/theme/bootstrapbase/less/moodle/buttons.less
@ -4,6 +4,10 @@
    margin-right: 5px;
    margin-bottom: 5px;
 }
+// Two singlebutton's side by side for ok/cancel.
+#notice .buttons .singlebutton {
+    display: inline-block;
+}
 .continuebutton {
    text-align: center;
 }
--- a/theme/bootstrapbase/style/moodle.css
+++ b/theme/bootstrapbase/style/moodle.css