Merge branch 'wip-MDL-36277-master' of git://github.com/barbararamiro/moodle

Conflicts:
	theme/standard/style/course.css

diff --cc theme/base/style/core.css
Simple merge

diff --cc theme/standard/style/course.css
index 895b202,62e933c..1b756ee
--- 1/theme/standard/style/course.css
--- 2/theme/standard/style/course.css
+++ b/theme/standard/style/course.css
@@@ -22,8 -22,8 +22,8 @@@
  .path-course-view .availabilityinfo {font-size:0.85em;color:#aaa;}
  .path-course-view .availabilityinfo strong {font-weight:normal;color:black;}
  .path-course-view .dimmed_text img {opacity:0.3;filter: alpha(opacity='30');}
 -.path-course-view .section {font-size:0.95em;line-height:1.2em;}
 +.path-course-view .section {font-size:1em;line-height:1.2em;}
- .path-course-view .section .activity {padding:0.2em 0;}
+ .path-course-view .section .activity {padding:0.2em 0;line-height: 2em;}
  .path-course-view .section .activity a {line-height:1em;}
  .path-course-view .section .weekdates {margin: 0;font-weight: normal;font-size: 1em;}
  .path-course-view .section .groupinglabel {color: #666666;}
@@@ -114,4 -114,4 +114,4 @@@
  #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 .sharecoursecontinue  {text-align: center;}