Merge branch 'MDL-39338_M25' of git://github.com/lazydaisy/moodle int…

…o MOODLE_25_STABLE Conflicts: theme/bootstrapbase/style/moodle.css
Chitrank-Dixit · Jun 10, 2013 · ade2afc · ade2afc
2 parents 534f147 + 82887b2
commit ade2afc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/theme/bootstrapbase/less/moodle/question.less b/theme/bootstrapbase/less/moodle/question.less
@@ -180,8 +180,7 @@
 }
 .que .formulation,
 .que .outcome,
-.que .comment,
-.que .history {
+.que .comment {
     .alert
 }
 .que .formulation {
@@ -192,7 +191,6 @@
 .formulation select {
     width: auto;
 }
-
 .path-mod-quiz input[size] {
     width: auto;
 }
@@ -202,8 +200,7 @@
     .alert-success;
 }
 .que .history {
-    color: @textColor;
-    background: @grayLighter;
+    .well
 }
 .que .ablock {
     margin: 0.7em 0 0.3em 0;

diff --git a/theme/bootstrapbase/style/moodle.css b/theme/bootstrapbase/style/moodle.css