mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-18 22:08:20 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-39338_master' of git://github.com/lazydaisy/moodle

Browse Source 
Conflicts:
	theme/bootstrapbase/style/moodle.css
This commit is contained in:
Dan Poltawski 2013-06-10 16:06:22 +08:00
commit c6898e629b
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
theme/bootstrapbase/less/moodle/question.less
View File

@ -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;

2
theme/bootstrapbase/style/moodle.css
View File

File diff suppressed because one or more lines are too long