* Per Nikerabbits suggestion: Move vertical-align into CSS

* Move text-align into CSS too.

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index b740811..63fbf9f 100644 (file)
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -1341,7 +1341,7 @@ $wgCacheEpoch = '20030516000000';
  * to ensure that client-side caches don't keep obsolete copies of global
  * styles.
  */
-$wgStyleVersion = '156';
+$wgStyleVersion = '157';
 
 
 # Server-side caching:

diff --git a/includes/specials/Preferences.php b/includes/specials/Preferences.php
index 5215e3e..6a16f1c 100644 (file)
--- a/includes/specials/Preferences.php
+++ b/includes/specials/Preferences.php
@@ -486,25 +486,21 @@ class PreferencesForm {
         * @return xhtml block
         */
        function tableRow( $td1, $td2 = null, $td3 = null ) {
-               global $wgContLang;
-
-               $align['align'] = $wgContLang->isRtl() ? 'right' : 'left';
-               $align['style'] = 'vertical-align:top;';
 
                if ( is_null( $td3 ) ) {
                        $td3 = '';
                } else {
                        $td3 = Xml::tags( 'tr', null,
-                               Xml::tags( 'td', array( 'colspan' => '2' ), $td3 )
+                               Xml::tags( 'td', array( 'class' => 'pref-label', 'colspan' => '2' ), $td3 )
                        );
                }
 
                if ( is_null( $td2 ) ) {
-                       $td1 = Xml::tags( 'td', $align + array( 'colspan' => '2' ), $td1 );
+                       $td1 = Xml::tags( 'td', array( 'class' => 'pref-label', 'colspan' => '2' ), $td1 );
                        $td2 = '';
                } else {
-                       $td1 = Xml::tags( 'td', $align, $td1 );
-                       $td2 = Xml::tags( 'td', $align, $td2 );
+                       $td1 = Xml::tags( 'td', array( 'class' => 'pref-label' ), $td1 );
+                       $td2 = Xml::tags( 'td', array( 'class' => 'pref-input' ), $td2 );
                }
 
                return Xml::tags( 'tr', null, $td1 . $td2 ). $td3 . "\n";

diff --git a/skins/modern/main.css b/skins/modern/main.css
index 6374988..0204860 100644 (file)
--- a/skins/modern/main.css
+++ b/skins/modern/main.css
@@ -366,6 +366,11 @@ h1, h2 {
        font-weight: bold;
 }
 
+.pref-label, .pref-input {
+       text-align: left;
+       vertical-align: top;
+}
+
 #preftoc li.selected {
        background-color: #bbbbbb;
 }

diff --git a/skins/modern/rtl.css b/skins/modern/rtl.css
index e286a3f..dc56573 100644 (file)
--- a/skins/modern/rtl.css
+++ b/skins/modern/rtl.css
@@ -72,6 +72,10 @@ div.townBox dl dd {
        padding-right: 2em;
 }
 
+.pref-label, .pref-input {
+       text-align: right;
+}
+
 /* workaround for moz bug, displayed bullets on left side */
 
 #toc ul {

diff --git a/skins/monobook/main.css b/skins/monobook/main.css
index c052e32..78feacd 100644 (file)
--- a/skins/monobook/main.css
+++ b/skins/monobook/main.css
@@ -1037,6 +1037,10 @@ li#ca-watch, li#ca-unwatch, li#ca-varlang-0, li#ca-print {
 .prefsection table, .prefsection legend {
        background-color: #F9F9F9;
 }
+.pref-label, .pref-input {
+       text-align: left;
+       vertical-align: top;
+}
 .mainLegend {
        display: none;
 }

diff --git a/skins/monobook/rtl.css b/skins/monobook/rtl.css
index 73bc145..56af796 100644 (file)
--- a/skins/monobook/rtl.css
+++ b/skins/monobook/rtl.css
@@ -195,6 +195,10 @@ li#ca-watch {
        padding-right: 2em;
 }
 
+.pref-label, .pref-input {
+       text-align: right;
+}
+
 /* workaround for moz bug, displayed bullets on left side */
 
 #toc ul {

diff --git a/skins/simple/main.css b/skins/simple/main.css
index 6578d97..bbc3d79 100644 (file)
--- a/skins/simple/main.css
+++ b/skins/simple/main.css
@@ -403,6 +403,11 @@ div.prefsectiontip {
     margin-top: 1em;
 }
 
+.pref-label, .pref-input {
+       text-align: left;
+       vertical-align: top;
+}
+
 #mw_trackbacks {
        border-style: groove;
        padding: 0.2em;

diff --git a/skins/simple/rtl.css b/skins/simple/rtl.css
index 13e7aa9..1d3a6a3 100644 (file)
--- a/skins/simple/rtl.css
+++ b/skins/simple/rtl.css
@@ -141,6 +141,10 @@ div.townBox dl dd {
        padding-right: 2em;
 }
 
+.pref-label, .pref-input {
+       text-align: right;
+}
+
 /* workaround for moz bug, displayed bullets on left side */
 
 #toc ul {