From: Raimond Spekking <raymond@users.mediawiki.org>
Date: Thu, 19 Jun 2008 10:07:34 +0000 (+0000)
Subject: * Per Nikerabbits suggestion: Move vertical-align into CSS
X-Git-Tag: 1.31.0-rc.0~46953
X-Git-Url: http://git.cyclocoop.org//%22javascript:ModifierStyle%28%27%22.%24id.%22%27%29/%22?a=commitdiff_plain;h=f94fc89f0da11b989f8e022158671c0437ede61f;p=lhc%2Fweb%2Fwiklou.git

* 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 b74081163b..63fbf9fa42 100644
--- 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 5215e3ece7..6a16f1cba0 100644
--- 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 6374988920..02048602f4 100644
--- 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 e286a3f429..dc56573de5 100644
--- 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 c052e32af0..78feacd262 100644
--- 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 73bc1451f7..56af796314 100644
--- 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 6578d970ec..bbc3d791d7 100644
--- 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 13e7aa91f4..1d3a6a321a 100644
--- 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 {