Merge branch 'MDL-61019-34' of https://github.com/lucaboesch/moodle i…

…nto MOODLE_34_STABLE

mod/lesson/renderer.php

@@ -505,10 +505,9 @@ public function progress_bar(lesson $lesson, $progress = null) {
            $progress = $lesson->calculate_progress();
        }

        // print out the Progress Bar.  Attempted to put as much as possible in the style sheets.
        $content = '<br />' . html_writer::tag('div', $progress . '%', array('class' => 'progress_bar_completed', 'style' => 'width: '. $progress . '%;'));
        $printprogress = html_writer::tag('div', get_string('progresscompleted', 'lesson', $progress) . $content, array('class' => 'progress_bar'));

        $content = html_writer::start_tag('progress', array('class' => 'progress', 'value' => $progress, 'max' => 100));
        $content .= html_writer::end_tag('progress');
        $printprogress = html_writer::tag('div', get_string('progresscompleted', 'lesson', $progress) . $content);
        return $this->output->box($printprogress, 'progress_bar');
    }

theme/boost/scss/moodle/modules.scss

@@ -244,7 +244,15 @@ div#dock {
#page-mod-lesson-view .branchbuttoncontainer .singlebutton button[type="submit"] {
    white-space: normal;
}

#page-mod-lesson-view {
    .vertical .singlebutton {
        display: block;
        + .singlebutton {
            margin-left: 0;
            margin-top: 1rem;
        }
    }
}
.path-mod-wiki .wiki_headingtitle,
.path-mod-wiki .midpad,
.path-mod-wiki .wiki_headingtime {

theme/bootstrapbase/less/moodle/core.less

@@ -2242,6 +2242,11 @@ body.lockscroll {
    margin: 0 auto;
}

progress {
    display: block;
    width: 100%;
}

/* IE10 only fix for calendar titling */
.ie10 .yui3-calendar-header-label {
    display: inline-block;

theme/bootstrapbase/style/moodle.css

@@ -4660,6 +4660,10 @@ body.lockscroll {
  max-width: 500px;
  margin: 0 auto;
}
progress {
  display: block;
  width: 100%;
}
/* IE10 only fix for calendar titling */
.ie10 .yui3-calendar-header-label {
  display: inline-block;