MDL-41438 core renderer: additional patch to remove .main definition …

…from all core themes

theme/base/style/core.css

@@ -97,10 +97,10 @@ img.resize {height: 1em;width: 1em;}
 .breadcrumb img.resize {height: 0.9em;width: 0.8em;}
 
 /* Icon styles */
-img.icon {height:16px;vertical-align:middle;width:16px;padding-right: 6px;}
+img.icon {height:16px;vertical-align:text-bottom;width:16px;padding-right: 6px;}
 .dir-rtl img.icon {padding-left: 6px; padding-right: 0; }
 img.iconsmall {height:12px;margin-right:3px;vertical-align:middle;width:12px;}
-img.iconhelp, .helplink img {height:16px; padding-left:3px;vertical-align:middle;width:16px;}
+img.iconhelp, .helplink img {height:16px; padding-left:3px;vertical-align:text-bottom;width:16px;}
 .dir-rtl img.iconhelp, .dir-rtl .helplink img {padding-right: 3px; padding-left: 0; }
 img.iconlarge {height: 24px; width: 24px; vertical-align:middle;}
 img.iconsort { vertical-align: text-bottom; padding-left: .3em; margin-bottom: .15em;}
@@ -135,12 +135,18 @@ form.popupform div {display: inline;}
 .arrow_button input {overflow:hidden;}
 .action-icon img.smallicon { vertical-align: text-bottom; margin-left: .45em;}
 .dir-rtl .action-icon img.smallicon { margin-right: .45em; margin-left: 0;}
-h1 img,
-h2 img,
-h3 img,
-h4 img,
-h5 img,
-h6 img {vertical-align: middle;}
+h1 img.icon,
+h1 img.iconhelp,
+h2 img.icon,
+h2 img.iconhelp,
+h3 img.icon,
+h3 img.iconhelp,
+h4 img.icon,
+h4 img.iconhelp,
+h5 img.icon,
+h5 img.iconhelp,
+h6 img.icon,
+h6 img.iconhelp {vertical-align: middle;}
 
 /** The 1-pixel padding is there to avoid phantom scroll bars on OS X (FF, Safari and Chrome)**/
 .no-overflow {overflow:auto;padding-bottom:1px;}
@@ -1494,3 +1500,17 @@ div.badge .expireimage { width: 100px; height: 100px; left: 20px; top: 0px; }
 
 ul.dragdrop-keyboard-drag li { list-style-type: none; }
 .block-control-actions .moodle-core-dragdrop-draghandle img { width: 12px; height: 12px; }
+
+.block .header h2,
+.course-content h3,
+.pagelayout-frontpage h2,
+.pagelayout-frontpage h3,
+.pagelayout-frontpage h4,
+.pagelayout-frontpage h5,
+.pagelayout-frontpage h6,
+.pagelayout-coursecategory h3,
+.pagelayout-coursecategory h4,
+.pagelayout-coursecategory h5,
+.pagelayout-coursecategory h6 {
+    text-align: inherit;
+}

theme/base/style/course.css

@@ -10,7 +10,7 @@
 .dir-rtl .section_add_menus .urlselect { margin-right: .4em; margin-left: 0;}
 .section_add_menus .urlselect select { margin-left: .2em;}
 .dir-rtl .section_add_menus .urlselect select { margin-right: .2em; margin-left: 0;}
-.section_add_menus .urlselect img.iconhelp { padding: 0; margin: 0; vertical-align: middle;}
+.section_add_menus .urlselect img.iconhelp { padding: 0; margin: 0; vertical-align: text-bottom;}
 
 .site-topic ul.section,
 .course-content ul.section { margin: 1em;}
@@ -211,7 +211,7 @@ input.titleeditor { width: 330px; vertical-align: text-bottom; }
 /* Course drag and drop upload styles */
 #dndupload-status {width:40%;margin:0 30%;padding:6px;border:1px solid #ddd;text-align:center;background:#ffc;position:absolute;z-index:9999;box-shadow:2px 2px 5px 1px #ccc;border-radius:0px 0px 8px 8px;z-index: 0;}
 .dndupload-preview {color:#909090;border:1px dashed #909090;list-style:none; margin-top: .2em; padding: .3em; line-height: 16px;}
-.dndupload-preview img.icon { vertical-align: middle; padding: 0;}
+.dndupload-preview img.icon { vertical-align: text-bottom; padding: 0;}
 .dndupload-progress-outer {width:70px;border:1px solid black;border-radius:4px;height:10px;display:inline-block;margin:0;padding:0;overflow:hidden;position:relative;}
 .dndupload-progress-inner {width:0%;height:100%;background-color:green;display:inline-block;margin:0;padding:0;float:left;box-shadow: 0 0 4px #229b15;border-radius:2px;background-repeat:repeat-x;background-position:top;background-image:url([[pix:theme_base|progress]])}
 .dndupload-hidden {display:none;}

theme/bootstrapbase/less/moodle/core.less

@@ -181,7 +181,7 @@ img.resize {
 /* Icon styles */
 img.icon {
     height: 16px;
-    vertical-align: middle;
+    vertical-align: text-bottom;
     width: 16px;
     padding-right: 6px;
 }
@@ -198,9 +198,17 @@ img.iconsmall {
 img.iconhelp, .helplink img {
     height: 16px;
     padding-left: 3px;
-    vertical-align: middle;
+    vertical-align: text-bottom;
     width: 16px;
 }
+h1 img.iconhelp, h1 img.icon,
+h2 img.iconhelp, h2 img.icon,
+h3 img.iconhelp, h3 img.icon,
+h4 img.iconhelp, h4 img.icon,
+h5 img.iconhelp, h5 img.icon,
+h6 img.iconhelp, h6 img.icon {
+  vertical-align: middle;
+}
 .dir-rtl img.iconhelp, .dir-rtl .helplink img {
     padding-right: 3px;
     padding-left: 0;
@@ -294,9 +302,7 @@ form.popupform div {
     vertical-align: text-bottom;
     margin: 0 0.3em;
 }
-img {
-    vertical-align: middle;
-}
+
 /** The 1-pixel padding is there to avoid phantom scroll bars on OS X (FF, Safari and Chrome)**/
 .no-overflow {
     overflow: auto;

theme/bootstrapbase/less/moodle/course.less

@@ -31,7 +31,7 @@
 .section_add_menus .urlselect img.iconhelp {
     padding: 0;
     margin: 0;
-    vertical-align: middle;
+    vertical-align: text-bottom;
 }
 
 .site-topic ul.section,
@@ -330,7 +330,7 @@ span.editinstructions {
     padding: .3em;
 }
 .dndupload-preview img.icon {
-    vertical-align: middle;
+    vertical-align: text-bottom;
     padding: 0;
 }
 .dndupload-progress-outer {

theme/brick/style/core.css

@@ -272,7 +272,7 @@ div.block.hidden div.header {
 
 /** main headings **/
 
-.generalbox h2,h3.sectionname, h2.headingblock,h2,h3, h2 a, h3 a, div.loginpanel h2, div.signuppanel h2 {
+.generalbox h2,h3.sectionname, h2.headingblock, div.loginpanel h2, div.signuppanel h2, div.userprofile h2 {
     font-weight: 600;
     letter-spacing: -1px;
     line-height: 1.3em;
@@ -283,7 +283,7 @@ div.block.hidden div.header {
     background-position: 0% 100%;
 }
 
-.generalbox h2, h3.sectionname, h2 a, h3 a, div.loginpanel h2, div.signuppanel h2, div.hd h3 {
+.generalbox h2, h3.sectionname, div.loginpanel h2, div.signuppanel h2, div.hd h3 {
     font-size: 22px;
     background: none;
 }

theme/formal_white/style/formal_white.css

@@ -22,7 +22,7 @@ h3 {font-size:120%;}
 h4 {font-weight:bold;}
 
 h1.headerheading {margin:14px 11px 8px 11px;float:left;font-size:200%;}
-h2, h3, h4 {margin:1em;padding:0;text-align:center;}
+h2, h3, h4 {padding:0;}
 
 /* page-header */
 #page-header{