Merge branch 'wip-MDL-25511' of git://github.com/lazydaisy/moodle

Conflicts:
	theme/canvas/style/course.css

diff --cc theme/canvas/style/course.css
index e660786,0363d04..5c1fe70
--- 1/theme/canvas/style/course.css
--- 2/theme/canvas/style/course.css
+++ b/theme/canvas/style/course.css
@@@ -63,50 -63,50 +63,50 @@@
  }
  
  .path-course-view .section_add_menus {
-       margin-top: 1em;
+     margin-top: 1em;
  }
  
 -#page-course-report .plugin p,
 -#page-course-report .logselectform {
 +#page-report .plugin p,
 +#page-report .logselectform {
-       text-align: center;
+     text-align: center;
  }
  
 -#page-course-report .logselectform .select {
 +#page-report .logselectform .select {
-       margin: 0 4px 10px;
+     margin: 0 4px 10px;
  }
  
 -#page-course-report-outline-index .loginfo {
 +#page-report-outline-index .loginfo {
-       text-align: center;
-       margin-bottom: 1em;
+     text-align: center;
+     margin-bottom: 1em;
  }
  
 -#page-course-report-participation-index #participationreport {
 +#page-report-participation-index #participationreport {
-       text-align: center;
+     text-align: center;
  }
  
 -#page-course-report-participation-index #participationreport .reporttable {
 +#page-report-participation-index #participationreport .reporttable {
-       margin: 0 auto 1em;
+     margin: 0 auto 1em;
  }
  
 -#page-course-report-participation-index #participationreport .selectbuttons input {
 +#page-report-participation-index #participationreport .selectbuttons input {
-       margin: 10px 5px;
+     margin: 10px 5px;
  }
  
 -#page-course-report-log-live .info,
 -#page-course-report-log-index .logselectform,
 -#page-course-report-log-index .info,
 -#page-course-report-log-index .paging {
 +#page-report-loglive-index .info,
 +#page-report-log-index .logselectform,
 +#page-report-log-index .info,
 +#page-report-log-index .paging {
-       text-align: center;
+     text-align: center;
  }
  
 -#page-course-report-log-index .logselectform select,
 -#page-course-report-log-index .logselectform input {
 +#page-report-log-index .logselectform select,
 +#page-report-log-index .logselectform input {
-       margin: 2px 4px;
+     margin: 2px 4px;
  }
  
 -#page-course-report-log-live .generaltable,
 -#page-course-report-log-index .generaltable {
 +#page-report-loglive-index .generaltable,
 +#page-report-log-index .generaltable {
-       margin: 5px auto;
+     margin: 5px auto;
  }
  
  #page-course-loginas #notice {
@@@ -126,9 -129,22 +129,22 @@@
      float:left;
      margin-right:10px;
  }
- #page-course-publish-metadata .hubscreenshot img {vertical-align: bottom;}
+ #page-course-publish-metadata .hubscreenshot img {
+     vertical-align: bottom;
+ }
+ 
  #page-course-publish-metadata .hubdescription {}
- #page-course-publish-metadata .hubinfo {display:block; margin-bottom:20px;}
+ 
+ #page-course-publish-metadata .hubinfo {
+     display:block;
+     margin-bottom:20px;
+ }
  #page-course-publish-metadata .hublink {}
- #page-course-publish-backup .courseuploadtextinfo {text-align: center;}
- #page-course-publish-backup .sharecoursecontinue  {text-align: center;}
+ 
+ #page-course-publish-backup .courseuploadtextinfo {
+     text-align: center;
+ }
+ 
+ #page-course-publish-backup .sharecoursecontinue  {
+     text-align: center;
 -}
++}