MDL-41438 core renderer: additional patch to remove .main definition from all core themes

theme/anomaly/style/base.css

@@ -13,12 +13,12 @@ h1, h1.headermain, h2, h2.tagline, h3, h4, h5 {
     padding: 0;
 }
 
-h1.main,
-h2.main,
-h3.main,
-h4.main,
-h5.main,
-h6.main {
+h1,
+h2,
+h3,
+h4,
+h5,
+h6 {
     text-align: center;
 }
 

theme/base/style/core.css

@@ -135,12 +135,12 @@ 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.main img,
-h2.main img,
-h3.main img,
-h4.main img,
-h5.main img,
-h6.main img {vertical-align: middle;}
+h1 img,
+h2 img,
+h3 img,
+h4 img,
+h5 img,
+h6 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;padding-bottom:1px;}

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: text-bottom;}
+.section_add_menus .urlselect img.iconhelp { padding: 0; margin: 0; vertical-align: middle;}
 
 .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: text-bottom; padding: 0;}
+.dndupload-preview img.icon { vertical-align: middle; 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/base/style/grade.css

@@ -63,6 +63,6 @@
 #page-grade-grading-pick .template-actions .action .action-icon {margin:0px 3px;}
 #page-grade-grading-pick .template-preview-confirm {width:50%;margin:1em auto;border:1px solid #EEE; padding: 1em;}
 #page-grade-grading-pick .singlebutton,
-.path-grade-report-user h2.main {
+.path-grade-report-user h2 {
     clear:both;
 }

theme/base/style/user.css

@@ -9,7 +9,7 @@
 
 .user-box {margin:8px;width:115px;height:160px;text-align:center;float:left;clear: none;}
 
-.userlist .main .action-icon img {vertical-align: middle;}
+.userlist .action-icon img {vertical-align: middle;}
 
 .userlist #showall {margin: 10px 0px;}
 .userlist .buttons {text-align: center;}
@@ -63,4 +63,4 @@
 .dir-rtl .userlist table#participants {margin: 0 auto;}
 .dir-rtl .userprofile dl dt {float:right; width:110px; margin-left:10px;}
 .dir-rtl .userprofile dl dd {margin-right: 120px;}
-#page-my-index.dir-rtl .block h3.main { text-align: right;}
+#page-my-index.dir-rtl .block h3 { text-align: right;}

theme/bootstrapbase/less/moodle/blocks.less

@@ -8,7 +8,7 @@
     margin: 0;
 }
 .block .header .title h2,
-.block h3.main {
+.block h3 {
   .nav-header;
   font-size: 1.1em;
 }

theme/bootstrapbase/less/moodle/core.less

@@ -294,7 +294,7 @@ form.popupform div {
     vertical-align: text-bottom;
     margin: 0 0.3em;
 }
-.main img {
+img {
     vertical-align: middle;
 }
 /** The 1-pixel padding is there to avoid phantom scroll bars on OS X (FF, Safari and Chrome)**/

theme/bootstrapbase/less/moodle/course.less

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

theme/bootstrapbase/less/moodle/forms.less

@@ -249,7 +249,7 @@ div.backup-section + form,
     display: inline-block; // So above style sticks.
 }
 
-#adminsettings h3.main {
+#adminsettings h3 {
     // Copied from bootstrap/forms.less tag legend.
     display: block;
     width: 100%;

theme/bootstrapbase/less/moodle/user.less

@@ -17,7 +17,7 @@
     float: left;
     clear: none;
 }
-.userlist .main .action-icon img {
+.userlist .action-icon img {
     vertical-align: middle;
 }
 .userlist #showall {
@@ -167,6 +167,6 @@
 .dir-rtl .userlist table#participants {
     margin: 0 auto;
 }
-#page-my-index.dir-rtl .block h3.main {
+#page-my-index.dir-rtl .block h3 {
     text-align: right;
 }

theme/boxxie/style/core.css

@@ -130,8 +130,8 @@ a:active {
     overflow: auto;
 }
 
-.block_recent_activity h2,main,
-.block_recent_activity h3.main {
+.block_recent_activity h2,
+.block_recent_activity h3 {
     font-size: 1em;
     margin: 0.5em 0;
 }
@@ -370,7 +370,7 @@ h2.headingblock {
     display: inline;
 }
 
-#page-user-index h3.main {
+#page-user-index h3 {
     margin: 1em 0;
 }
 
@@ -774,7 +774,7 @@ h2.headingblock {
     margin: 0 auto;
 }
 
-#page-mod-choice-view h2.main {
+#page-mod-choice-view h2 {
     font-size: 1.5em;
     margin: 1em 0;
 }
@@ -789,7 +789,7 @@ h2.headingblock {
 
 /* Feedback */
 
-.path-mod-feedback h4.main {
+.path-mod-feedback h4 {
     margin-top: 1em;
 }
 
@@ -842,7 +842,7 @@ h2.headingblock {
     border-bottom: 1px solid #e5e5e5;
 }
 
-.path-mod-glossary .entrybox .glossarycategoryheader th h2.main {
+.path-mod-glossary .entrybox .glossarycategoryheader th h2 {
     font-size: 1.2em;
     line-height: 1.5;
     margin: 0;

theme/brick/style/colors.css

@@ -27,7 +27,7 @@ div.block {
 	border-bottom: 1px solid [[setting:maincolor]];
 }
 
-.generalbox h2,h3.sectionname, h2.headingblock,h2.main,h3.main, h2.main a, h3.main a, div.loginpanel h2, div.signuppanel h2, .forumpost .subject {
+.generalbox h2,h3.sectionname, h2.headingblock,h2,h3, h2 a, h3 a, div.loginpanel h2, div.signuppanel h2, .forumpost .subject {
 	color: [[setting:headingcolor]];
 }
 

theme/brick/style/core.css

@@ -251,7 +251,7 @@ div.block.hidden div.header {
     padding: 4px;
 }
 
-.block div.content h1, .block div.content h2.main, .block div.content h3.main {
+.block div.content h1, .block div.content h2, .block div.content h3 {
     font-size: 13px;
     background-image: none;
 }
@@ -272,7 +272,7 @@ div.block.hidden div.header {
 
 /** main headings **/
 
-.generalbox h2,h3.sectionname, h2.headingblock,h2.main,h3.main, h2.main a, h3.main a, div.loginpanel h2, div.signuppanel h2 {
+.generalbox h2,h3.sectionname, h2.headingblock,h2,h3, h2 a, h3 a, div.loginpanel h2, div.signuppanel 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.main a, h3.main a, div.loginpanel h2, div.signuppanel h2, div.hd h3.main {
+.generalbox h2, h3.sectionname, h2 a, h3 a, div.loginpanel h2, div.signuppanel h2, div.hd h3 {
     font-size: 22px;
     background: none;
 }

theme/canvas/style/admin.css

@@ -15,7 +15,7 @@
     padding: 10px;
 }
 
-#page-admin-index h2.main {
+#page-admin-index h2 {
     padding: 1em 0;
 }
 

theme/canvas/style/blocks.css

@@ -18,12 +18,12 @@
     margin-right: 2px;
 }
 
-.block h3.main {
+.block h3 {
     padding: 0.5em 0;
     text-align: left;
     font-size: 1.1em;
 }
-.dir-rtl .block h3.main {text-align: right;}
+.dir-rtl .block h3 {text-align: right;}
 
 /* Login
 ------------------------------*/

theme/canvas/style/mods.css

@@ -163,7 +163,7 @@
     text-align: center;
 }
 
-#page-mod-assignment-view h3.main {
+#page-mod-assignment-view h3 {
     padding-top: 1em;
 }
 

theme/canvas/style/text.css

@@ -10,7 +10,7 @@ h1,h2,h3,h4,h5,h6 {
     margin: 0;
 }
 
-h2.main,h3.main,h4.main {
+h2,h3,h4 {
     text-align: center;
     padding: 0.5em 0 1em;
     margin: 0;

theme/formal_white/style/course.css

@@ -25,7 +25,7 @@
 .coursebox > .info:after {clear:both;content:".";display:block;height:0;min-width:0;visibility:hidden;}
 .coursebox .enrolmenticons img, .coursebox .moreinfo img {margin: 0.3em 0.2em -0.2em 0;}
 
-#page-course-recent h2.main {font-size:110%;}
+#page-course-recent h2 {font-size:110%;}
 #page-course-recent .user {font-size:75%;}
 #page-course-recent .grade {font-style:italic;font-size:90%;}
 #page-course-recent .forum-recent .reply .title {font-style:italic;font-size:90%;}

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.main, h3.main, h4.main {margin:1em;padding:0;text-align:center;}
+h2, h3, h4 {margin:1em;padding:0;text-align:center;}
 
 /* page-header */
 #page-header{

theme/magazine/style/colors.css

@@ -46,7 +46,7 @@ div.dockedtitle {
 
 /** main headings and forum post subject default color #4e0000 **/
 
-#nologo, #nologo a, .generalbox h2,h3.sectionname, div.tabtree li.selected a span, .forumpost .subject, .blog_entry div.subject a, h2.headingblock,h2.main,h3.main, h2.main a, h3.main a, div.loginpanel h2, div.signuppanel h2 {
+#nologo, #nologo a, .generalbox h2,h3.sectionname, div.tabtree li.selected a span, .forumpost .subject, .blog_entry div.subject a, h2.headingblock,h2,h3, h2 a, h3 a, div.loginpanel h2, div.signuppanel h2 {
     color: [[setting:headingcolor]];
 }
 

theme/magazine/style/core.css

@@ -459,11 +459,11 @@ div#jcontrols_button span.arrow.sep {
 
 /** inner block style for decent display of recent news, etc **/
 
-.block_recent_activity.block_docked div.content h2.main,
-.block_recent_activity.block_docked div.content h3.main,
-.side-pre .block div.content h2.main,
-.side-post .block div.content h2.main,
-.block div.content h3.main,
+.block_recent_activity.block_docked div.content h2,
+.block_recent_activity.block_docked div.content h3,
+.side-pre .block div.content h2,
+.side-post .block div.content h2,
+.block div.content h3,
 .block div.content h2 {
     font-size: 13px;
     color: #333;
@@ -697,7 +697,7 @@ html>
 
 /** main headings **/
 
-.generalbox h2,h3.sectionname, h2.headingblock,h2.main,h3.main, h2.main a, h3.main a, div.loginpanel h2, div.signuppanel h2 {
+.generalbox h2,h3.sectionname, h2.headingblock,h2,h3, h2 a, h3 a, div.loginpanel h2, div.signuppanel h2 {
     font-size: 30px;
     padding-bottom: 2px;
     margin: 3px 0 2px;
@@ -710,7 +710,7 @@ html>
     background: url([[pix:theme|hr_grid]]) repeat-x 0% 89%
     }
 
-.generalbox h2, h3.sectionname, h2.main a, h3.main a, div.loginpanel h2, div.signuppanel h2, div.hd h3.main {
+.generalbox h2, h3.sectionname, h2 a, h3 a, div.loginpanel h2, div.signuppanel h2, div.hd h3 {
     font-size: 22px;
     background: none;
 }
@@ -1029,7 +1029,7 @@ div.assignment.overview div {
 
 /** glossary activity **/
 
-table.glossarycategoryheader h2.main {
+table.glossarycategoryheader h2 {
     text-align: center;
     margin-bottom: 0;
     margin-top: 0;
@@ -1108,7 +1108,7 @@ div.generalbox.sitetopic, div.generalbox.authsui,#page-admin-roles-assign div.ge
     border: none;
 }
 
-div.generalbox.firstpageoptions h3.main {
+div.generalbox.firstpageoptions h3 {
     font-size: 16px;
 }
 

theme/mymobile/jquery/custom131.js

@@ -210,7 +210,7 @@ $(document).ready(function() {
         //my moodle page fixes
         //block_course_overview
         $('.block_course_overview div.headingwrap').attr("data-role", "none");
-        $('.block_course_overview h3.main a').attr("data-theme", mytheme);
+        $('.block_course_overview h3 a').attr("data-theme", mytheme);
     });
 
     //resource only stuff to help embedded PDFs, provides link to open in new window

theme/mymobile/style/core.css

@@ -1085,7 +1085,7 @@ table.event {
     width: 26px;
 }
 /*mymoodle */
-#page-my-indexPAGE .headingwrap h3.main a {
+#page-my-indexPAGE .headingwrap h3 a {
     color: inherit !important;
 }
 #page-my-indexPAGE .box.coursebox {
@@ -1106,7 +1106,7 @@ table.event {
 #page-my-indexPAGE .coursebox .overview .info {
     margin-left: 5px;
 }
-#page-my-indexPAGE .block h3.main {
+#page-my-indexPAGE .block h3 {
     text-align: left;
     margin-left: 15px;
 }

theme/splash/style/core.css

@@ -356,7 +356,7 @@ li.activity {
 }
 /* Quiz
 -------------------------*/
-#page-mod-quiz-edit h2.main{
+#page-mod-quiz-edit h2{
     display: block;
 }
 #page-mod-quiz-edit div.question div.content div.questioncontrols{

theme/splash/style/pagelayout.css

@@ -266,10 +266,10 @@ a:hover,
     line-height:1em;
     padding:10px 0;
 }
-h2.main,h3.main,h4.main,h5.main,h6.main{
+h2,h3,h4,h5,h6{
     text-align:left;
 }
-#region-main h2.main{
+#region-main h2{
     font-size:1.6em;
     font-weight:400;
     line-height:1.6em;
@@ -742,7 +742,7 @@ table.quizreviewsummary {
     margin:0 auto;
     width:960px;
 }
-.pagelayout-report #page-content #report-main-content .region-content h2.main{
+.pagelayout-report #page-content #report-main-content .region-content h2{
     margin:5px 0;
 }
 .jsenabled .collapsed .collapsibleregioninner{

theme/standard/style/core.css

@@ -18,12 +18,12 @@ a:hover {text-decoration:underline;color:#FF0000;}
 /**
  * Headings
  */
-h1.main,
-h2.main,
-h3.main,
-h4.main,
-h5.main,
-h6.main {text-align:center;font-weight:bold;}
+h1,
+h2,
+h3,
+h4,
+h5,
+h6 {text-align:center;font-weight:bold;}
 
 th.header,
 td.header,

theme/standard/style/course.css

@@ -6,7 +6,7 @@
 .course-content ul.weeks li.section .right {padding:4px 0;}
 
 /** Course **/
-#page-course-recent h2.main {font-size:1.1em;}
+#page-course-recent h2 {font-size:1.1em;}
 #page-course-recent .user {font-size:0.75em;}
 #page-course-recent .grade {font-style: italic;font-size:0.9em;}
 #page-course-recent .forum-recent .reply .title {font-style: italic;font-size:0.9em;}

theme/upgrade.txt

@@ -1,21 +1,15 @@
 This files describes API changes in /theme/* themes,
 information provided here is intended especially for theme designer.
 === 2.6 ===
+
 Notes:
 * The parameters value for the following functions have been modified: core_renderer::heading() and core_renderer::heading_with_help().
-  In core_renderer::heading(), the third param value for classname is set to null as default.
-  In core_renderer::heading_with_help(), additional parameters are added for heading level with default value set to 2,
-  and classname with default value set to null.
+  This means that headings using the default options will no longer have the class "main" which was the previous default.
 
-=== 2.6 ===
-Notes:
 * The file picker and activity chooser have been converted to use M.core.dialogue. This means the styles
-for these elements have changed in the base and bootstrapbase themes and you will need to copy the new styles
-if you are not inheriting from either one of these themes.
+  for these elements have changed in the base and bootstrapbase themes and you will need to copy the new styles
+  if you are not inheriting from either one of these themes.
 
-=== 2.6 ===
-
-Notes:
 * A new component action_menu is now used to display editing icons for courses and blocks within a drop down. If you have a theme that doesn't
   extend base, canvas, or clean then you will need to style for this new component within your theme.