From 89466f470bf42deddc3db110e8f9ac08d0c334da Mon Sep 17 00:00:00 2001 From: Platonides Date: Thu, 29 Nov 2012 00:05:52 +0100 Subject: [PATCH] Skin: Make portlet rules backwards compatible with html cache. Follows-up I9a2ebd50. Caused regression with 1.21wmf5. Change-Id: Iabda81555d2af6d91447a51ff3d8b6ea1f1f00c2 --- skins/modern/main.css | 9 ++++++--- skins/vector/screen.css | 35 ++++++++++++++++++++++++----------- 2 files changed, 30 insertions(+), 14 deletions(-) diff --git a/skins/modern/main.css b/skins/modern/main.css index eff62ab43b..f201209d22 100644 --- a/skins/modern/main.css +++ b/skins/modern/main.css @@ -58,7 +58,8 @@ body { font-variant: small-caps; } -#p-personal h3 { +#p-personal h3, +#p-personal h5 { display: none; } @@ -176,7 +177,8 @@ textarea { margin-top: .4em; } -.portlet h3 { +.portlet h3, +.portlet h5 { padding: 0.1em 0 0.3em 1em; margin: 0 0 0 0; background-color: #dddddd; @@ -250,7 +252,8 @@ ul { color: white; } -#p-cactions h3 { +#p-cactions h3, +#p-cactions h5 { display: none; } diff --git a/skins/vector/screen.css b/skins/vector/screen.css index 23975e7392..26967a57ec 100644 --- a/skins/vector/screen.css +++ b/skins/vector/screen.css @@ -66,7 +66,8 @@ div#mw-head { right: 0; width: 100%; } -div#mw-head h3 { +div#mw-head h3, +div#mw-head h5 { margin: 0; padding: 0; } @@ -82,7 +83,8 @@ div.emptyPortlet { /* Display on top of page tabs - bug 37158 */ z-index: 1; } -#p-personal h3 { +#p-personal h3, +#p-personal h5 { display: none; } #p-personal ul { @@ -115,7 +117,9 @@ div.emptyPortlet { } /* Navigation Labels */ div.vectorTabs h3, -div.vectorMenu h3 span { +div.vectorTabs h5, +div.vectorMenu h3 span, +div.vectorMenu h5 span { display: none; } /* Namespaces and Views */ @@ -235,21 +239,25 @@ body.rtl div.vectorMenu { } /* OVERRIDDEN BY COMPLIANT BROWSERS */ /* @noflip */ -div#mw-head div.vectorMenu h3 { +div#mw-head div.vectorMenu h3, +div#mw-head div.vectorMenu h5 { 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 h3, +div#mw-head div.vectorMenu h5 { background-position: bottom left; margin-left: -1px; } /* IGNORED BY IE6 */ -div#mw-head div.vectorMenu > h3 { +div#mw-head div.vectorMenu > h3, +div#mw-head div.vectorMenu > h5 { background-image: none; } +div#mw-head div.vectorMenu h4, div.vectorMenu#p-variants #mw-vector-current-variant { display: inline-block; float: left; @@ -261,7 +269,8 @@ div.vectorMenu#p-variants #mw-vector-current-variant { } /* OVERRIDDEN BY COMPLIANT BROWSERS */ /* @noflip */ -div.vectorMenu h3 a { +div.vectorMenu h3 a, +div.vectorMenu h5 a { display: inline-block; width: 24px; height: 1.9em; @@ -271,11 +280,13 @@ div.vectorMenu h3 a { background-repeat: no-repeat; } /* This will be flipped - unlike the one above it */ -div.vectorMenu h3 a { +div.vectorMenu h3 a, +div.vectorMenu h5 a { background-position: bottom right; } /* IGNORED BY IE6 */ -div.vectorMenu h3 > a { +div.vectorMenu h3 > a, +div.vectorMenu h5 > a { display: block; } div.vectorMenu div.menu { @@ -354,7 +365,8 @@ div.vectorMenu li.selected a:visited { text-decoration: none; } /* Search */ -#p-search h3 { +#p-search h3, +#p-search h5 { display: none; } /* @noflip */ @@ -471,7 +483,8 @@ div#mw-panel div.portal { padding-bottom: 1.5em; direction: ltr; } -div#mw-panel div.portal h3 { +div#mw-panel div.portal h3, +div#mw-panel div.portal h5 { font-weight: normal; color: #444; padding: 0.25em; -- 2.20.1