msg('tagline') ?>
html('subtitle') ?>
Index: skins/monobook/IE60Fixes.css
===================================================================
--- skins/monobook/IE60Fixes.css (revision 58284)
+++ skins/monobook/IE60Fixes.css (working copy)
@@ -85,7 +85,6 @@
width: 96%;
}
-div.editsection,
#catlinks,
div.tright,
div.tleft {
Index: skins/monobook/IE70Fixes.css
===================================================================
--- skins/monobook/IE70Fixes.css (revision 58284)
+++ skins/monobook/IE70Fixes.css (working copy)
@@ -69,7 +69,6 @@
}
/*
-div.editsection,
#catlinks,
div.tright,
div.tleft {
Index: skins/monobook/main.css
===================================================================
--- skins/monobook/main.css (revision 58284)
+++ skins/monobook/main.css (working copy)
@@ -112,32 +112,34 @@
margin: .2em 0 .2em 0;
}
-h1, h2, h3, h4, h5, h6 {
+/* Headers */
+.mw-h1, .mw-h2, .mw-h3, .mw-h4, .mw-h5, .mw-h6 {
color: black;
background: none;
- font-weight: normal;
margin: 0;
- padding-top: .5em;
- padding-bottom: .17em;
border-bottom: 1px solid #aaa;
}
+.mw-h3, .mw-h4, .mw-h5, .mw-h6 {
+ border-bottom: none;
+}
+h1, h2 { font-weight: normal; }
h1 { font-size: 188%; }
-h1 .editsection { font-size: 53%; }
h2 { font-size: 150%; }
-h2 .editsection { font-size: 67%; }
-h3, h4, h5, h6 {
- border-bottom: none;
- font-weight: bold;
-}
h3 { font-size: 132%; }
-h3 .editsection { font-size: 76%; font-weight: normal; }
h4 { font-size: 116%; }
-h4 .editsection { font-size: 86%; font-weight: normal; }
h5 { font-size: 100%; }
-h5 .editsection { font-weight: normal; }
h6 { font-size: 80%; }
-h6 .editsection { font-size: 125%; font-weight: normal; }
+/* To replicate the old padding, where h# were block-level elements and edit
+ * links were floated, we need to multiply .5em top padding and .17em bottom
+ * padding by the header text sizes. */
+.mw-h1 { padding: .94em 0 .32em; } /* (0.5*1.88)em 0 (0.17*1.88)em */
+.mw-h2 { padding: .75em 0 .26em; } /* (0.5*1.50)em 0 (0.17*1.50)em */
+.mw-h3 { padding: .66em 0 .22em; } /* etc. */
+.mw-h4 { padding: .58em 0 .20em; }
+.mw-h5 { padding: .50em 0 .17em; }
+.mw-h6 { padding: .40em 0 .14em; }
+
ul {
line-height: 1.5em;
list-style-type: square;
Index: skins/monobook/rtl.css
===================================================================
--- skins/monobook/rtl.css (revision 58284)
+++ skins/monobook/rtl.css (working copy)
@@ -40,11 +40,6 @@
float: right;
clear: right;
}
-.editsection {
- float: left;
- margin-right: 5px;
- margin-left: 0; /* bug 9122: undo default LTR */
-}
/* recover IEMac (might be fine with the float, but usually it's close to IE */
*>body .portlet {
float: none;
Index: skins/simple/main.css
===================================================================
--- skins/simple/main.css (revision 58284)
+++ skins/simple/main.css (working copy)
@@ -1,26 +1,3 @@
-/* For clarity, explicitly state some recommendations from
to make sure the editsection links scale right */
-
-h1 { font-size: 2em; }
-h2 { font-size: 1.5em; }
-h3 { font-size: 1.17em; }
-h5 { font-size: .83em; }
-h6 { font-size: .75em; }
-h1, h2, h3, h4, h5, h6 { font-weight: bolder }
-
-/* Now the custom parts */
-
-/* Make edit sections (which are inside h# tags) normal-sized */
-.editsection {
- font-weight: normal;
-}
-h1 .editsection { font-size: 50% }
-h2 .editsection { font-size: 66.7% }
-h3 .editsection { font-size: 85.5% }
-h5 .editsection { font-size: 120% }
-h6 .editsection { font-size: 133% }
-
-
#toolbar {
display: none;
}
@@ -86,11 +63,22 @@
}
p img { margin: 0; }
-h1, h2, h3, h4, h5, h6 {
- margin: 0;
- padding-top: 0.5em;
- padding-bottom: 0.17em;
+.mw-h1, .mw-h2, .mw-h3, .mw-h4, .mw-h5, .mw-h6 {
+ margin: 0;
}
+/* To replicate the old padding, where h# were block-level elements and edit
+ * links were floated, we need to multiply .5em top padding and .17em bottom
+ * padding by the header text sizes. We assume the W3 recommendations are
+ * used: 200%, 150%, 117%, 100%, 83%, 75% size in that order
+ * . If not the padding may be margin-
+ * ally off. */
+.mw-h1 { padding: .94em 0 .32em; } /* (0.5*1.88)em 0 (0.17*1.88)em */
+.mw-h2 { padding: .75em 0 .26em; } /* (0.5*1.50)em 0 (0.17*1.50)em */
+.mw-h3 { padding: .66em 0 .22em; } /* etc. */
+.mw-h4 { padding: .58em 0 .20em; }
+.mw-h5 { padding: .50em 0 .17em; }
+.mw-h6 { padding: .40em 0 .14em; }
+
fieldset {
margin: 1em 0em 1em 0em;
padding: 0em 1em 1em 1em;
@@ -195,7 +183,7 @@
border: solid 1px black;
}
-h1.firstHeading, h2 {
+.firstHeading, .mw-h2 {
border-bottom: solid 1px black;
}
#bodyContent a[href ^="http://"],
@@ -383,10 +371,5 @@
display: none;
}
-.editsection {
- float: right;
- margin-left: 5px;
-}
-
.templatesUsed { margin-top: 1.5em; }
Index: skins/simple/rtl.css
===================================================================
--- skins/simple/rtl.css (revision 58284)
+++ skins/simple/rtl.css (working copy)
@@ -40,11 +40,6 @@
float: right;
clear: right;
}
-.editsection {
- float: left;
- margin-right: 5px;
- margin-left: 0; /* bug 9122: undo default LTR */
-}
/* recover IEMac (might be fine with the float, but usually it's close to IE */
*>body .portlet {
float: none;
Index: skins/Vector.php
===================================================================
--- skins/Vector.php (revision 58284)
+++ skins/Vector.php (working copy)
@@ -472,7 +472,7 @@
- html( 'title' ) ?>
+ html('title') ?>
Index: skins/vector/main-ltr.css
===================================================================
--- skins/vector/main-ltr.css (revision 58284)
+++ skins/vector/main-ltr.css (working copy)
@@ -643,40 +643,38 @@
}
/* Structural Elements */
-h1,
-h2,
-h3,
-h4,
-h5,
-h6 {
+.mw-h1,
+.mw-h2,
+.mw-h3,
+.mw-h4,
+.mw-h5,
+.mw-h6 {
color: black;
background: none;
- font-weight: normal;
margin: 0;
- padding-top: .5em;
- padding-bottom: .17em;
border-bottom: 1px solid #aaa;
width: auto;
}
-h1 { font-size: 188%; }
-h1 .editsection { font-size: 53%; }
-h2 { font-size: 150%; }
-h2 .editsection { font-size: 67%; }
-h3,
-h4,
-h5,
-h6 {
+.mw-h3, .mw-h4, .mw-h5, .mw-h6 {
border-bottom: none;
- font-weight: bold;
}
+h1, h2 { font-weight: normal; }
+h1 { font-size: 188%; }
+h2 { font-size: 150%; }
h3 { font-size: 132%; }
-h3 .editsection { font-size: 76%; font-weight: normal; }
h4 { font-size: 116%; }
-h4 .editsection { font-size: 86%; font-weight: normal; }
h5 { font-size: 100%; }
-h5 .editsection { font-weight: normal; }
h6 { font-size: 80%; }
-h6 .editsection { font-size: 125%; font-weight: normal; }
+/* To replicate the old padding, where h# were block-level elements and edit
+ * links were floated, we need to multiply .5em top padding and .17em bottom
+ * padding by the header text sizes. */
+.mw-h1 { padding: .94em 0 .32em; } /* (0.5*1.88)em 0 (0.17*1.88)em */
+.mw-h2 { padding: .75em 0 .26em; } /* (0.5*1.50)em 0 (0.17*1.50)em */
+.mw-h3 { padding: .66em 0 .22em; } /* etc. */
+.mw-h4 { padding: .58em 0 .20em; }
+.mw-h5 { padding: .50em 0 .17em; }
+.mw-h6 { padding: .40em 0 .14em; }
+
p {
margin: .4em 0 .5em 0;
line-height: 1.5em;
Index: skins/vector/main-rtl.css
===================================================================
--- skins/vector/main-rtl.css (revision 58284)
+++ skins/vector/main-rtl.css (working copy)
@@ -643,40 +643,38 @@
}
/* Structural Elements */
-h1,
-h2,
-h3,
-h4,
-h5,
-h6 {
+.mw-h1,
+.mw-h2,
+.mw-h3,
+.mw-h4,
+.mw-h5,
+.mw-h6 {
color: black;
background: none;
- font-weight: normal;
margin: 0;
- padding-top: .5em;
- padding-bottom: .17em;
border-bottom: 1px solid #aaa;
width: auto;
}
-h1 { font-size: 188%; }
-h1 .editsection { font-size: 53%; }
-h2 { font-size: 150%; }
-h2 .editsection { font-size: 67%; }
-h3,
-h4,
-h5,
-h6 {
+.mw-h3, .mw-h4, .mw-h5, .mw-h6 {
border-bottom: none;
- font-weight: bold;
}
+h1, h2 { font-weight: normal; }
+h1 { font-size: 188%; }
+h2 { font-size: 150%; }
h3 { font-size: 132%; }
-h3 .editsection { font-size: 76%; font-weight: normal; }
h4 { font-size: 116%; }
-h4 .editsection { font-size: 86%; font-weight: normal; }
h5 { font-size: 100%; }
-h5 .editsection { font-weight: normal; }
h6 { font-size: 80%; }
-h6 .editsection { font-size: 125%; font-weight: normal; }
+/* To replicate the old padding, where h# were block-level elements and edit
+ * links were floated, we need to multiply .5em top padding and .17em bottom
+ * padding by the header text sizes. */
+.mw-h1 { padding: .94em 0 .32em; } /* (0.5*1.88)em 0 (0.17*1.88)em */
+.mw-h2 { padding: .75em 0 .26em; } /* (0.5*1.50)em 0 (0.17*1.50)em */
+.mw-h3 { padding: .66em 0 .22em; } /* etc. */
+.mw-h4 { padding: .58em 0 .20em; }
+.mw-h5 { padding: .50em 0 .17em; }
+.mw-h6 { padding: .40em 0 .14em; }
+
p {
margin: .4em 0 .5em 0;
line-height: 1.5em;