From 11a623864692c9f9d3f4dbb15dde735519c47cf7 Mon Sep 17 00:00:00 2001 From: Matthew Flaschen Date: Sat, 27 Apr 2013 23:17:55 -0400 Subject: [PATCH] Don't underline a elements with the mw-ui-button class: This is in addition to an existing 'text-decoration: none' on the class itself. This is being kept for other elements (e.g. button), but is not specific enough to beat a conflicting declaration in commonElements.css Change-Id: I8ec7efd97abad0ca75dea9b1c28e1fb91323741f --- resources/mediawiki.ui/mediawiki.ui.default.css | 11 ++++++++--- resources/mediawiki.ui/mediawiki.ui.vector.css | 11 ++++++++--- .../sourcefiles/scss/components/default/_buttons.scss | 8 ++++++++ 3 files changed, 24 insertions(+), 6 deletions(-) diff --git a/resources/mediawiki.ui/mediawiki.ui.default.css b/resources/mediawiki.ui/mediawiki.ui.default.css index c32f54bd68..0f8d4207d9 100644 --- a/resources/mediawiki.ui/mediawiki.ui.default.css +++ b/resources/mediawiki.ui/mediawiki.ui.default.css @@ -100,7 +100,12 @@ width: 100%; } -/* line 48, sourcefiles/scss/components/default/_buttons.scss */ +/* line 49, sourcefiles/scss/components/default/_buttons.scss */ +a.mw-ui-button { + text-decoration: none; +} + +/* line 56, sourcefiles/scss/components/default/_buttons.scss */ .mw-ui-button-group > * { -webkit-border-radius: 0; -moz-border-radius: 0; @@ -109,7 +114,7 @@ border-radius: 0; float: left; } -/* line 52, sourcefiles/scss/components/default/_buttons.scss */ +/* line 60, sourcefiles/scss/components/default/_buttons.scss */ .mw-ui-button-group > *:first-child { -moz-border-radius-topleft: 3px; -webkit-border-top-left-radius: 3px; @@ -118,7 +123,7 @@ -webkit-border-bottom-left-radius: 3px; border-bottom-left-radius: 3px; } -/* line 57, sourcefiles/scss/components/default/_buttons.scss */ +/* line 65, sourcefiles/scss/components/default/_buttons.scss */ .mw-ui-button-group > *:last-child { -moz-border-radius-topright: 3px; -webkit-border-top-right-radius: 3px; diff --git a/resources/mediawiki.ui/mediawiki.ui.vector.css b/resources/mediawiki.ui/mediawiki.ui.vector.css index 5995439418..9826526d6d 100644 --- a/resources/mediawiki.ui/mediawiki.ui.vector.css +++ b/resources/mediawiki.ui/mediawiki.ui.vector.css @@ -99,7 +99,12 @@ width: 100%; } -/* line 48, sourcefiles/scss/components/default/_buttons.scss */ +/* line 49, sourcefiles/scss/components/default/_buttons.scss */ +a.mw-ui-button { + text-decoration: none; +} + +/* line 56, sourcefiles/scss/components/default/_buttons.scss */ .mw-ui-button-group > * { -webkit-border-radius: 0; -moz-border-radius: 0; @@ -108,7 +113,7 @@ border-radius: 0; float: left; } -/* line 52, sourcefiles/scss/components/default/_buttons.scss */ +/* line 60, sourcefiles/scss/components/default/_buttons.scss */ .mw-ui-button-group > *:first-child { -moz-border-radius-topleft: 3px; -webkit-border-top-left-radius: 3px; @@ -117,7 +122,7 @@ -webkit-border-bottom-left-radius: 3px; border-bottom-left-radius: 3px; } -/* line 57, sourcefiles/scss/components/default/_buttons.scss */ +/* line 65, sourcefiles/scss/components/default/_buttons.scss */ .mw-ui-button-group > *:last-child { -moz-border-radius-topright: 3px; -webkit-border-top-right-radius: 3px; diff --git a/resources/mediawiki.ui/sourcefiles/scss/components/default/_buttons.scss b/resources/mediawiki.ui/sourcefiles/scss/components/default/_buttons.scss index 1ea9a1814c..d67810f739 100644 --- a/resources/mediawiki.ui/sourcefiles/scss/components/default/_buttons.scss +++ b/resources/mediawiki.ui/sourcefiles/scss/components/default/_buttons.scss @@ -44,6 +44,14 @@ $buttonBorderRadius: 3px; } } +// This overrides an underline declaration on a:hover and a:focus in commonElements.css, which the +// class alone isn't specific enough to do +a.mw-ui-button { + text: { + decoration: none; + } +} + // Button groups .mw-ui-button-group > * { @include border-radius(0); -- 2.20.1