From 488d44c8651f83893735c7fa7c41a82dc709ecdf Mon Sep 17 00:00:00 2001 From: Robin Pepermans Date: Sun, 4 Sep 2011 22:05:56 +0000 Subject: [PATCH] Fix r96261: don't add important if 'none', so it doesn't break underlining on hover --- includes/resourceloader/ResourceLoaderUserOptionsModule.php | 2 +- skins/Simple.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 */ -- 2.20.1