Merge branch 'MDL-45611-26' of git://github.com/phalacee/moodle into MOODLE_26_STABLE

Conflicts:
	theme/bootstrapbase/style/moodle.css
This commit is contained in:
Eloy Lafuente (stronk7)
2014-06-17 01:12:34 +02:00
2 changed files with 15 additions and 2 deletions
+14 -1
View File
@@ -456,9 +456,22 @@ body.path-question-type .fitem_fgroup .accesshide {
}
#page-mod-quiz-edit div.question div.content div.points {
margin-top: -0.5em;
padding-bottom: 0.5em;
padding-bottom: 0em;
border: none;
background-color: @bodyBackground;
position: static;
width: 12.1em;
float: right;
margin-right: 60px;
}
#page-mod-quiz-edit.dir-rtl div.question div.content div.points {
float: left;
margin-left: 60px;
margin-right: 0px;
}
#page-mod-quiz-edit div.question div.content div.points br {
display: none;
}
#page-mod-quiz-edit div.question div.content div.points label {
display: inline-block;
File diff suppressed because one or more lines are too long