From 1d0ac206a826b738f27b0b80d50678391e390eb6 Mon Sep 17 00:00:00 2001 From: andrewmbacon Date: Mon, 1 Jun 2015 16:17:14 -0400 Subject: [PATCH] Updating button reset to also reset text color of links. --- sass/_buttons.scss | 87 +++++++++++++++++++++++----------------------- 1 file changed, 43 insertions(+), 44 deletions(-) diff --git a/sass/_buttons.scss b/sass/_buttons.scss index bb6dc85..6fd35d1 100644 --- a/sass/_buttons.scss +++ b/sass/_buttons.scss @@ -9,47 +9,46 @@ // -------------------------------------------------- #{$selector} .btn { - display: inline-block; - margin-bottom: 0; // For input.btn - font-weight: $btn-font-weight; - text-align: center; - vertical-align: middle; - cursor: pointer; - background-image: none; // Reset unusual Firefox-on-Android default style; see https://github.com/necolas/normalize.css/issues/214 - border: 1px solid transparent; - white-space: nowrap; - @include button-size($padding-base-vertical, $padding-base-horizontal, $font-size-base, $line-height-base, $border-radius-base); - @include user-select(none); - - &, - &:active, - &.active { - &:focus { - @include tab-focus(); - } - } - - &:hover, - &:focus { - color: $btn-default-color; - text-decoration: none; - } - - &:active, - &.active { - outline: 0; - background-image: none; - @include box-shadow(inset 0 3px 5px rgba(0,0,0,.125)); - } - - &.disabled, - &[disabled], - fieldset[disabled] & { - cursor: not-allowed; - pointer-events: none; // Future-proof disabling of clicks - @include opacity(.65); - @include box-shadow(none); - } + display: inline-block; + margin-bottom: 0; // For input.btn + font-weight: $btn-font-weight; + text-align: center; + vertical-align: middle; + cursor: pointer; + background-image: none; // Reset unusual Firefox-on-Android default style; see https://github.com/necolas/normalize.css/issues/214 + border: 1px solid transparent; + white-space: nowrap; + @include button-size($padding-base-vertical, $padding-base-horizontal, $font-size-base, $line-height-base, $border-radius-base); + @include user-select(none); + + &:active, + &.active { + &:focus { + @include tab-focus(); + } + } + + &:hover, + &:focus { + color: $btn-default-color !important; + text-decoration: none; + } + + &:active, + &.active { + outline: 0; + background-image: none; + @include box-shadow(inset 0 3px 5px rgba(0,0,0,.125)); + } + + &.disabled, + &[disabled], + fieldset[disabled] & { + cursor: not-allowed; + pointer-events: none; // Future-proof disabling of clicks + @include opacity(.65); + @include box-shadow(none); + } } @@ -85,7 +84,7 @@ // Make a button look and behave like a link #{$selector} .btn-link { - color: $link-color; + color: $link-color !important; font-weight: normal; cursor: pointer; border-radius: 0; @@ -105,7 +104,7 @@ } &:hover, &:focus { - color: $link-hover-color; + color: $link-hover-color !important; text-decoration: underline; background-color: transparent; } @@ -113,7 +112,7 @@ fieldset[disabled] & { &:hover, &:focus { - color: $btn-link-disabled-color; + color: $btn-link-disabled-color !important; text-decoration: none; } }