Merging in fixes for MDL-8929 from MOODLE_18_STABLE

This commit is contained in:
mark-nielsen 2007-03-16 04:35:49 +00:00
parent 632d3b9ad6
commit 9fcbddaed0
2 changed files with 4 additions and 4 deletions

View File

@ -23,7 +23,7 @@ $string['and'] = 'AND';
$string['answer'] = 'Answer';
$string['answeredcorrectly'] = 'answered correctly.';
$string['answersfornumerical'] = 'Answers for Numerical questions should be matched pairs of Minimum and Maximum values';
$string['arrangebuttonshorizontally'] = 'Arrange Branch buttons horizontally in slideshow mode?';
$string['arrangebuttonshorizontally'] = 'Arrange Branch buttons horizontally?';
$string['attempt'] = 'Attempt: $a';
$string['attempts'] = 'Attempts';
$string['attemptsdeleted'] = 'Deleted attempts';

View File

@ -193,11 +193,11 @@
/* Next classes are for branch table buttons when displayed horizontally */
.mod-lesson .prevhorizontal,
.mod-lesson .prevhorizontal .lessonbutton,
.mod-lesson .prevhorizontal div,
.mod-lesson .nexthorizontal,
.mod-lesson .nexthorizontal .lessonbutton,
.mod-lesson .nexthorizontal div,
.mod-lesson .standardhorizontal,
.mod-lesson .standardhorizontal .lessonbutton {
.mod-lesson .standardhorizontal div {
display: inline;
}