Matmarex has uploaded a new change for review. https://gerrit.wikimedia.org/r/72151
Change subject: Remove unnecessary h5 selectors ...................................................................... Remove unnecessary h5 selectors They were only here for backwards-compatibility due to HTML caching (see bug 42452). Also change one JS test that still used <h5> (the tag used doesn't matter in it anyway). Change-Id: Ibdf248d9779ded03444fe68f3149d6531fc7b154 --- M skins/modern/main.css M skins/vector/screen.css M skins/vector/vector.js M tests/qunit/suites/resources/mediawiki/mediawiki.util.test.js 4 files changed, 19 insertions(+), 34 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/51/72151/1 diff --git a/skins/modern/main.css b/skins/modern/main.css index 47a2542..a42845a 100644 --- a/skins/modern/main.css +++ b/skins/modern/main.css @@ -58,8 +58,7 @@ font-variant: small-caps; } -#p-personal h3, -#p-personal h5 { +#p-personal h3 { display: none; } @@ -177,8 +176,7 @@ margin-top: .4em; } -.portlet h3, -.portlet h5 { +.portlet h3 { padding: 0.1em 0 0.3em 1em; margin: 0 0 0 0; background-color: #dddddd; @@ -252,8 +250,7 @@ color: white; } -#p-cactions h3, -#p-cactions h5 { +#p-cactions h3 { display: none; } diff --git a/skins/vector/screen.css b/skins/vector/screen.css index 222531c..9d2a310 100644 --- a/skins/vector/screen.css +++ b/skins/vector/screen.css @@ -61,8 +61,7 @@ right: 0; width: 100%; } -div#mw-head h3, -div#mw-head h5 { +div#mw-head h3 { margin: 0; padding: 0; } @@ -78,8 +77,7 @@ /* Display on top of page tabs - bugs 37158, 48078 */ z-index: 100; } -#p-personal h3, -#p-personal h5 { +#p-personal h3 { display: none; } #p-personal ul { @@ -112,9 +110,7 @@ } /* Navigation Labels */ div.vectorTabs h3, -div.vectorTabs h5, -div.vectorMenu h3 span, -div.vectorMenu h5 span { +div.vectorMenu h3 span { display: none; } /* Namespaces and Views */ @@ -246,22 +242,19 @@ } /* OVERRIDDEN BY COMPLIANT BROWSERS */ /* @noflip */ -div#mw-head div.vectorMenu h3, -div#mw-head div.vectorMenu h5 { +div#mw-head div.vectorMenu h3 { float: left; /* @embed */ background-image: url(images/tab-break.png); background-repeat: no-repeat; } /* This will be flipped - unlike the one above it */ -div#mw-head div.vectorMenu h3, -div#mw-head div.vectorMenu h5 { +div#mw-head div.vectorMenu h3 { background-position: bottom left; margin-left: -1px; } /* IGNORED BY IE6 */ -div#mw-head div.vectorMenu > h3, -div#mw-head div.vectorMenu > h5 { +div#mw-head div.vectorMenu > h3 { background-image: none; } div#mw-head div.vectorMenu h4, @@ -276,8 +269,7 @@ } /* OVERRIDDEN BY COMPLIANT BROWSERS */ /* @noflip */ -div.vectorMenu h3 a, -div.vectorMenu h5 a { +div.vectorMenu h3 a { display: inline-block; width: 24px; height: 1.9em; @@ -287,13 +279,11 @@ background-repeat: no-repeat; } /* This will be flipped - unlike the one above it */ -div.vectorMenu h3 a, -div.vectorMenu h5 a { +div.vectorMenu h3 a { background-position: bottom right; } /* IGNORED BY IE6 */ -div.vectorMenu h3 > a, -div.vectorMenu h5 > a { +div.vectorMenu h3 > a { display: block; } div.vectorMenu div.menu { @@ -372,8 +362,7 @@ text-decoration: none; } /* Search */ -#p-search h3, -#p-search h5 { +#p-search h3 { display: none; } /* @noflip */ @@ -490,8 +479,7 @@ padding-bottom: 1.5em; direction: ltr; } -div#mw-panel div.portal h3, -div#mw-panel div.portal h5 { +div#mw-panel div.portal h3 { font-weight: normal; color: #444; padding: 0.25em; diff --git a/skins/vector/vector.js b/skins/vector/vector.js index fb1f212..ff3332f 100644 --- a/skins/vector/vector.js +++ b/skins/vector/vector.js @@ -32,14 +32,14 @@ if ( $cactions.hasClass( 'emptyPortlet' ) ) { $cactions .removeClass( 'emptyPortlet' ) - .find( 'h3, h5' ) + .find( 'h3' ) .css( 'width', '1px' ).animate( { 'width': '24px' }, 390 ); } } ) .bind( 'beforeTabExpand', function () { // If we're removing the last child node right now, hide the dropdown if ( $cactions.find( 'li' ).length === 1 ) { - $cactions.find( 'h3, h5' ).animate( { 'width': '1px' }, 390, function () { + $cactions.find( 'h3' ).animate( { 'width': '1px' }, 390, function () { $( this ).attr( 'style', '' ) .parent().addClass( 'emptyPortlet' ); }); diff --git a/tests/qunit/suites/resources/mediawiki/mediawiki.util.test.js b/tests/qunit/suites/resources/mediawiki/mediawiki.util.test.js index b4b5d0b..674f56a 100644 --- a/tests/qunit/suites/resources/mediawiki/mediawiki.util.test.js +++ b/tests/qunit/suites/resources/mediawiki/mediawiki.util.test.js @@ -142,12 +142,12 @@ pTestTb = '\ <div class="portlet" id="p-test-tb">\ - <h5>Toolbox</h5>\ + <h3>Toolbox</h3>\ <ul class="body"></ul>\ </div>'; pCustom = '\ <div class="portlet" id="p-test-custom">\ - <h5>Views</h5>\ + <h3>Views</h3>\ <ul class="body">\ <li id="c-foo"><a href="#">Foo</a></li>\ <li id="c-barmenu">\ @@ -159,7 +159,7 @@ </div>'; vectorTabs = '\ <div id="p-test-views" class="vectorTabs">\ - <h5>Views</h5>\ + <h3>Views</h3>\ <ul></ul>\ </div>'; -- To view, visit https://gerrit.wikimedia.org/r/72151 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibdf248d9779ded03444fe68f3149d6531fc7b154 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Matmarex <matma....@gmail.com> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits