From: Robin Pepermans <robin@users.mediawiki.org>
Date: Sun, 4 Sep 2011 22:05:56 +0000 (+0000)
Subject: Fix r96261: don't add important if 'none', so it doesn't break underlining on hover
X-Git-Tag: 1.31.0-rc.0~27909
X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/exercices/journal.php?a=commitdiff_plain;h=488d44c8651f83893735c7fa7c41a82dc709ecdf;p=lhc%2Fweb%2Fwiklou.git

Fix r96261: don't add important if 'none', so it doesn't break underlining on hover
---

diff --git a/includes/resourceloader/ResourceLoaderUserOptionsModule.php b/includes/resourceloader/ResourceLoaderUserOptionsModule.php
index 2f639066e2..24152b5ccc 100644
--- a/includes/resourceloader/ResourceLoaderUserOptionsModule.php
+++ b/includes/resourceloader/ResourceLoaderUserOptionsModule.php
@@ -97,7 +97,7 @@ class ResourceLoaderUserOptionsModule extends ResourceLoaderModule {
 			// Underline: 2 = browser default, 1 = always, 0 = never
 			if ( $options['underline'] < 2 ) {
 				$rules[] = "a { text-decoration: " . 
-					( $options['underline'] ? 'underline' : 'none' ) . " !important; }";
+					( $options['underline'] ? 'underline !important' : 'none' ) . "; }";
 			}
 			if ( $options['highlightbroken'] ) {
 				$rules[] = "a.new, #quickbar a.new { color: #ba0000; }\n";
diff --git a/skins/Simple.php b/skins/Simple.php
index ad0dbb03c1..ad1df57579 100644
--- a/skins/Simple.php
+++ b/skins/Simple.php
@@ -35,7 +35,7 @@ class SkinSimple extends SkinTemplate {
 		$underline = "";
 
 		if ( $wgUser->getOption( 'underline' ) < 2 ) {
-			$underline = "text-decoration: " . $wgUser->getOption( 'underline' ) ? 'underline' : 'none' . " !important;";
+			$underline = "text-decoration: " . $wgUser->getOption( 'underline' ) ? 'underline !important' : 'none' . ";";
 		}
 
 		/* Also inherits from resourceloader */