Move h1-5 bottom margins to commonElements, common generic siteNotice styles and...

diff --git a/skins/common/commonElements.css b/skins/common/commonElements.css
index a783f2b..d16ee68 100644 (file)
--- a/skins/common/commonElements.css
+++ b/skins/common/commonElements.css
@@ -103,6 +103,17 @@ h5 .editsection { font-weight: normal; }
 h6 { font-size: 80%;  }
 h6 .editsection { font-size: 125%; font-weight: normal; }
 
+/* Some space under the headers in the content area */
+h1,
+h2 {
+       margin-bottom: .6em;
+}
+h3,
+h4,
+h5 {
+       margin-bottom: .3em;
+}
+
 p {
        margin: .4em 0 .5em 0;
        line-height: 1.5em;

diff --git a/skins/common/commonInterface.css b/skins/common/commonInterface.css
index ef4e16c..d13cad2 100644 (file)
--- a/skins/common/commonInterface.css
+++ b/skins/common/commonInterface.css
@@ -22,6 +22,26 @@
        vertical-align: middle;
 }
 
+/* Site Notice (includes notices from CentralNotice extension) */
+#siteNotice {
+       position: relative;
+       text-align: center;
+       margin: 0;
+}
+#localNotice {
+       margin-bottom: 0.9em;
+}
+
+/* First h1 */
+.firstHeading,
+#firstHeading {
+       margin-bottom: .1em;
+       /* These two rules hack around bug 2013 (fix for more limited bug 11325).
+          When bug 2013 is fixed properly, they should be removed. */
+       line-height: 1.2em;
+       padding-bottom: 0;
+}
+
 /* Sub-navigation */
 #siteSub {
        display: none;

diff --git a/skins/monobook/main.css b/skins/monobook/main.css
index ce06862..72eae86 100644 (file)
--- a/skins/monobook/main.css
+++ b/skins/monobook/main.css
@@ -90,27 +90,13 @@ pre {
 ** the main content area
 */
 
-/* Some space under the headers in the content area */
-#bodyContent h1, #bodyContent h2 {
-       margin-bottom: .6em;
-}
-#bodyContent h3, #bodyContent h4, #bodyContent h5 {
-       margin-bottom: .3em;
-}
-#firstHeading {
-       margin-bottom: .1em;
-       /* These two rules hack around bug 2013 (fix for more limited bug 11325).
-          When bug 2013 is fixed properly, they should be removed. */
-       line-height: 1.2em;
-       padding-bottom: 0;
-}
-
 #siteNotice {
-       position: relative;
-       text-align: center;
        font-size: 95%;
        padding: 0 0.9em;
 }
+#localNotice {
+       margin: 0;
+}
 #siteNotice p {
        margin: 0;
        padding: 0;

diff --git a/skins/vector/screen.css b/skins/vector/screen.css
index 25929ce..fa22e10 100644 (file)
--- a/skins/vector/screen.css
+++ b/skins/vector/screen.css
@@ -686,29 +686,13 @@ pre {
 
 /* Site Notice (includes notices from CentralNotice extension) */
 #siteNotice {
-       position: relative;
-       text-align: center;
        font-size: 0.8em;
-       margin: 0;
-}
-#localNotice {
-       margin-bottom: 0.9em;
-}
-/* Edge Cases for Content */
-h1, h2 {
-       margin-bottom: .6em;
-}
-h3, h4, h5 {
-       margin-bottom: .3em;
 }
 #firstHeading {
        padding-top: 0;
        margin-top: 0;
        padding-top: 0;
-       margin-bottom: 0.1em;
-       line-height: 1.2em;
        font-size: 1.6em;
-       padding-bottom: 0;
 }
 div#content a.external,
 div#content a[href ^="gopher://"] {