From: Robin Pepermans <robin@users.mediawiki.org>
Date: Tue, 1 Nov 2011 00:17:37 +0000 (+0000)
Subject: Follow-up r96261: remove the !important again, and then do the script defaults differ... 
X-Git-Tag: 1.31.0-rc.0~26796
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_aide%28?a=commitdiff_plain;h=043f98a3e07391705744df6521cc1cd879f84e25;p=lhc%2Fweb%2Fwiklou.git

Follow-up r96261: remove the !important again, and then do the script defaults differently (so that those css rules are only for the default and don't affect when the user selected "never" or "always" underline)
---

diff --git a/includes/resourceloader/ResourceLoaderUserOptionsModule.php b/includes/resourceloader/ResourceLoaderUserOptionsModule.php
index 355c43ade7..4462abead1 100644
--- a/includes/resourceloader/ResourceLoaderUserOptionsModule.php
+++ b/includes/resourceloader/ResourceLoaderUserOptionsModule.php
@@ -97,7 +97,11 @@ class ResourceLoaderUserOptionsModule extends ResourceLoaderModule {
 			// Underline: 2 = browser default, 1 = always, 0 = never
 			if ( $options['underline'] < 2 ) {
 				$rules[] = "a { text-decoration: " .
-					( $options['underline'] ? 'underline !important' : 'none' ) . "; }";
+					( $options['underline'] ? 'underline' : 'none' ) . "; }";
+			} else {
+				# The scripts of these languages are very hard to read with underlines
+				$rules[] = 'a:lang(ar), a:lang(ckb), a:lang(fa),a:lang(kk-arab), ' .
+				'a:lang(mzn), a:lang(ps), a:lang(ur) { text-decoration: none; }';
 			}
 			if ( $options['highlightbroken'] ) {
 				$rules[] = "a.new, #quickbar a.new { color: #ba0000; }\n";
diff --git a/skins/common/shared.css b/skins/common/shared.css
index 0f6d9e0cd3..d7bce5a078 100644
--- a/skins/common/shared.css
+++ b/skins/common/shared.css
@@ -52,17 +52,6 @@ input[dir="rtl"] {
 	direction: rtl;
 }
 
-/* The scripts of these languages are very hard to read with underlines */
-[lang="ar"] a,
-[lang="ckb"] a,
-[lang="fa"] a,
-[lang="kk-arab"] a,
-[lang="mzn"] a,
-[lang="ps"] a,
-[lang="ur"] a {
-	text-decoration: none;
-}
-
 /* Default style for semantic tags */
 abbr,
 acronym,