Merge branch 'MDL-58732-master' of git://github.com/ryanwyllie/moodle

diff --cc blocks/myoverview/templates/course-event-list.mustache
index 6a51666,036d55c..74922d6
--- 1/blocks/myoverview/templates/course-event-list.mustache
--- 2/blocks/myoverview/templates/course-event-list.mustache
+++ b/blocks/myoverview/templates/course-event-list.mustache
@@@ -87,14 -87,12 +87,14 @@@
              </button>
          </div>
      </div>
-     <div class="hidden text-xs-center text-center" data-region="empty-message">
+     <div class="hidden text-xs-center text-center m-y-3" data-region="empty-message">
          <img class="empty-placeholder-image-sm"
               src="{{urls.noevents}}"
 -             alt="{{#str}} noevents, block_myoverview {{/str}}">
 +             alt="{{#str}} noevents, block_myoverview {{/str}}"
 +             role="presentation">
          <p class="text-muted m-t-1">{{#str}} noevents, block_myoverview {{/str}}</p>
 -        <a href="{{viewurl}}" class="btn btn-secondary text-primary">
 +        <a href="{{viewurl}}" class="btn btn-secondary text-primary"
 +           aria-label="{{#str}} viewcoursename, block_myoverview, {{fullnamedisplay}} {{/str}}">
              {{#str}} viewcourse, block_myoverview {{/str}}
          </a>
      </div>

diff --cc theme/bootstrapbase/style/moodle.css
Simple merge

diff --cc theme/bootstrapbase/templates/block_myoverview/course-event-list.mustache
index d900b32,b0623da..f6bcb03
--- 1/theme/bootstrapbase/templates/block_myoverview/course-event-list.mustache
--- 2/theme/bootstrapbase/templates/block_myoverview/course-event-list.mustache
+++ b/theme/bootstrapbase/templates/block_myoverview/course-event-list.mustache
@@@ -86,14 -87,12 +87,14 @@@
              </button>
          </div>
      </div>
-     <div class="hidden text-xs-center text-center" data-region="empty-message">
+     <div class="hidden text-xs-center text-center m-y-3" data-region="empty-message">
          <img class="empty-placeholder-image-sm"
               src="{{urls.noevents}}"
 -             alt="{{#str}} noevents, block_myoverview {{/str}}">
 +             alt="{{#str}} noevents, block_myoverview {{/str}}"
 +             role="presentation">
          <p class="text-muted m-t-1">{{#str}} noevents, block_myoverview {{/str}}</p>
 -        <a href="{{viewurl}}" class="btn btn-secondary text-primary">
 +        <a href="{{viewurl}}" class="btn btn-secondary text-primary"
 +           aria-label="{{#str}} viewcoursename, block_myoverview, {{fullnamedisplay}} {{/str}}">
              {{#str}} viewcourse, block_myoverview {{/str}}
          </a>
      </div>