Updating button reset to also reset text color of links.

jmr06005 · Jun 1, 2015 · 1d0ac20 · 1d0ac20
1 parent 3fee87e
commit 1d0ac20
Showing 1 changed file with 43 additions and 44 deletions.
diff --git 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,15 +104,15 @@
   }
   &:hover,
   &:focus {
-    color: $link-hover-color;
+    color: $link-hover-color !important;
     text-decoration: underline;
     background-color: transparent;
   }
   &[disabled],
   fieldset[disabled] & {
     &:hover,
     &:focus {
-      color: $btn-link-disabled-color;
+      color: $btn-link-disabled-color !important;
       text-decoration: none;
     }
   }