TheDJ has uploaded a new change for review.
https://gerrit.wikimedia.org/r/200312
Change subject: [WIP] Move edit-section out of h1-h6
......................................................................
[WIP] Move edit-section out of h1-h6
* Add a new div around the header with mw-header
* Add new CSS rules, that will allow us to make this change safely
TODO
* Fix parsertests
* Make similar CSS fixes for skins
* Check if MF will survive this
Post rollout steps:
* simplify CSS again
* fix extensions depending on mw-headline being a span
* merge h# + mw-headline
Bug: T13555
Change-Id: Iaa25b3188e1c9023d5d3f8588f027d624e818cae
---
M includes/Linker.php
M resources/src/mediawiki.legacy/commonPrint.css
M resources/src/mediawiki.legacy/oldshared.css
M resources/src/mediawiki.skinning/elements.css
4 files changed, 71 insertions(+), 20 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/12/200312/1
diff --git a/includes/Linker.php b/includes/Linker.php
index b58daba..133c765 100644
--- a/includes/Linker.php
+++ b/includes/Linker.php
@@ -1751,10 +1751,12 @@
public static function makeHeadline( $level, $attribs, $anchor, $html,
$link, $legacyAnchor = false
) {
- $ret = "<h$level$attribs"
+ $ret = "<div class=\"mw-header mw-h$level\">"
+ . "<h$level$attribs"
. "<span class=\"mw-headline\"
id=\"$anchor\">$html</span>"
+ . "</h$level>"
. $link
- . "</h$level>";
+ . "</div>";
if ( $legacyAnchor !== false ) {
$ret = "<div id=\"$legacyAnchor\"></div>$ret";
}
diff --git a/resources/src/mediawiki.legacy/commonPrint.css
b/resources/src/mediawiki.legacy/commonPrint.css
index 9a8d391..bff0fc0 100644
--- a/resources/src/mediawiki.legacy/commonPrint.css
+++ b/resources/src/mediawiki.legacy/commonPrint.css
@@ -47,7 +47,7 @@
page-break-inside: avoid;
}
-h2, h3, h4, h5, h6 {
+h2, h3, h4, h5, h6, .mw-header {
page-break-after: avoid;
}
diff --git a/resources/src/mediawiki.legacy/oldshared.css
b/resources/src/mediawiki.legacy/oldshared.css
index c2bd5a7..e417933 100644
--- a/resources/src/mediawiki.legacy/oldshared.css
+++ b/resources/src/mediawiki.legacy/oldshared.css
@@ -8,34 +8,45 @@
* http://www.w3.org/TR/CSS21/sample.html to make sure the editsection links
scale right
*/
-h1 {
+h1, .mw-header.mw-h1 {
font-size: 2em;
}
-h2 {
+h2, .mw-header.mw-h2 {
font-size: 1.5em;
}
-h3 {
+h3, .mw-header.mw-h3 {
font-size: 1.17em;
}
-h4 {
+h4, .mw-header.mw-h4 {
font-size: 1.11em;
}
-h5 {
+h5, .mw-header.mw-h5 {
font-size: 1.05em;
}
-h6 {
+h6, .mw-header.mw-h6 {
font-size: 1em;
}
-h1, h2, h3, h4, h5, h6 {
+h1, h2, h3, h4, h5, h6, .mw-header {
font-weight: bolder;
}
+/* Specific resets for the new layout */
+.mw-header h1,
+.mw-header h2,
+.mw-header h3,
+.mw-header h4,
+.mw-header h5,
+.mw-header h6 {
+ font-size: inherit;
+ font-weight: inherit;
+}
+
/* Now the custom parts */
#footer {
diff --git a/resources/src/mediawiki.skinning/elements.css
b/resources/src/mediawiki.skinning/elements.css
index eb57abb..922d66d 100644
--- a/resources/src/mediawiki.skinning/elements.css
+++ b/resources/src/mediawiki.skinning/elements.css
@@ -84,7 +84,8 @@
h3,
h4,
h5,
-h6 {
+h6,
+.mw-header {
color: black;
background: none;
font-weight: normal;
@@ -95,50 +96,87 @@
border-bottom: 1px solid #aaa;
}
-h1 {
+/* Specific resets for the new layout */
+.mw-header h1,
+.mw-header h2,
+.mw-header h3,
+.mw-header h4,
+.mw-header h5,
+.mw-header h6 {
+ display: inline;
+ border-bottom: none;
+}
+
+h1,
+.mw-header.mw-h1 {
font-size: 188%;
}
-h2 {
+h2,
+.mw-header.mw-h2 {
font-size: 150%;
}
h3,
h4,
h5,
-h6 {
+h6,
+.mw-header.mw-h3,
+.mw-header.mw-h4,
+.mw-header.mw-h5,
+.mw-header.mw-h6 {
border-bottom: none;
font-weight: bold;
}
-h3 {
+h3,
+.mw-header.mw-h3 {
font-size: 128%;
}
-h4 {
+h4,
+.mw-header.mw-h4 {
font-size: 116%;
}
-h5 {
+h5,
+.mw-header.mw-h5 {
font-size: 108%;
}
-h6 {
+h6,
+.mw-header.mw-h6 {
font-size: 100%;
}
/* Some space under the headers in the content area */
h1,
-h2 {
+h2,
+.mw-header.mw-h1,
+.mw-header.mw-h2 {
margin-bottom: .6em;
}
h3,
h4,
-h5 {
+h5,
+.mw-header.mw-h3,
+.mw-header.mw-h4,
+.mw-header.mw-h5 {
margin-bottom: .3em;
}
+/* New layout font and margin resets for old layout */
+.mw-header h1,
+.mw-header h2,
+.mw-header h3,
+.mw-header h4,
+.mw-header h5,
+.mw-header h6 {
+ font-size: inherit;
+ margin-bottom: 0;
+}
+
p {
margin: .4em 0 .5em 0;
line-height: 1.5em;
--
To view, visit https://gerrit.wikimedia.org/r/200312
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaa25b3188e1c9023d5d3f8588f027d624e818cae
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: TheDJ <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
