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 2f63906..24152b5 100644 (file)
--- 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 ad0dbb0..ad1df57 100644 (file)
--- 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 */