Add whitespace above "templates included on this page" using CSS, not hardcoded line...

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 37ce5df..7398422 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -120,7 +120,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * Added block option "enable autoblocks"
 * Amend Special:Ipblocklist to note when a block has autoblock DISABLED.
 * (bug 7780) Fix regression in editing redirects
-
+* Add whitespace above "templates included on this page" using CSS, not
+  hardcoded line break.
 
 == Languages updated ==
 

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 000344f..f3b5522 100644 (file)
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -1037,7 +1037,7 @@ $wgCacheEpoch = '20030516000000';
  * to ensure that client-side caches don't keep obsolete copies of global
  * styles.
  */
-$wgStyleVersion = '23';
+$wgStyleVersion = '24';
 
 # Server-side caching:
 

diff --git a/includes/EditPage.php b/includes/EditPage.php
index 4afee97..0a9800b 100644 (file)
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -1272,7 +1272,7 @@ END
                        $batch->execute();
 
                        # Construct the HTML
-                       $outText = '<br /><span class="mw-templatesUsedExplanation">'. wfMsgExt( 'templatesused', array( 'parseinline' ) ) . '</span><ul>';
+                       $outText = '<span class="mw-templatesUsedExplanation">'. wfMsgExt( 'templatesused', array( 'parseinline' ) ) . '</span><ul>';
                        foreach ( $templates as $titleObj ) {
                                $outText .= '<li>' . $sk->makeLinkObj( $titleObj ) . '</li>';
                        }

diff --git a/skins/chick/main.css b/skins/chick/main.css
index 6b52f4a..24034c8 100644 (file)
--- a/skins/chick/main.css
+++ b/skins/chick/main.css
@@ -489,3 +489,5 @@ div.gallerytext {
 #jump-to-nav {
   display: none;
 }
+
+.templatesUsed { margin-top: 1.5em; }
\ No newline at end of file

diff --git a/skins/common/common.css b/skins/common/common.css
index 2fa3ce9..3d4bc5e 100644 (file)
--- a/skins/common/common.css
+++ b/skins/common/common.css
@@ -454,3 +454,5 @@ table.multipageimage td {
 .imagelist .TablePager_col_links { background-color: #eeeeff }
 .imagelist .TablePager_col_img_description { white-space: normal }
 .imagelist th.TablePager_sort { background-color: #ccccff }
+
+.templatesUsed { margin-top: 1em; }
\ No newline at end of file

diff --git a/skins/monobook/main.css b/skins/monobook/main.css
index 78c9a4a..8c065b2 100644 (file)
--- a/skins/monobook/main.css
+++ b/skins/monobook/main.css
@@ -1506,3 +1506,5 @@ table.multipageimage td {
 .imagelist .TablePager_col_links { background-color: #eeeeff }
 .imagelist .TablePager_col_img_description { white-space: normal }
 .imagelist th.TablePager_sort { background-color: #ccccff }
+
+.templatesUsed { margin-top: 1.5em; }
\ No newline at end of file

diff --git a/skins/simple/main.css b/skins/simple/main.css
index 079cb45..8bed0f9 100644 (file)
--- a/skins/simple/main.css
+++ b/skins/simple/main.css
@@ -432,4 +432,6 @@ table.collapsed tr.collapsable {
 .editsection {
        float: right;
        margin-left: 5px;
-}
\ No newline at end of file
+}
+
+.templatesUsed { margin-top: 1.5em; }
\ No newline at end of file