Skip to content
Browse files

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

…o MOODLE_25_STABLE

Conflicts:
	theme/bootstrapbase/style/moodle.css
  • Loading branch information...
2 parents 534f147 + 82887b2 commit ade2afc29faa9c417cc233672262334a0eb2af58 @danpoltawski danpoltawski committed Jun 10, 2013
Showing with 3 additions and 6 deletions.
  1. +2 −5 theme/bootstrapbase/less/moodle/question.less
  2. +1 −1 theme/bootstrapbase/style/moodle.css
View
7 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;
View
2 theme/bootstrapbase/style/moodle.css
1 addition, 1 deletion not shown because the diff is too large. Please use a local Git client to view these changes.

0 comments on commit ade2afc

Please sign in to comment.
Something went wrong with that request. Please try again.