From 3df78ce11b33b83e397752b11cbb49a91ff2c5a0 Mon Sep 17 00:00:00 2001 From: Beau Smith Date: Fri, 16 Sep 2016 13:02:52 -0700 Subject: [PATCH 1/2] Remove hard-coded value in button-outline-variant Fixes #20609 PR #20641, another solution to this issue, hard-codes use of $body-color, which may not be the desired color for the text when hovering. --- scss/mixins/_buttons.scss | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/scss/mixins/_buttons.scss b/scss/mixins/_buttons.scss index 5196ab65e1..853a46bfc5 100644 --- a/scss/mixins/_buttons.scss +++ b/scss/mixins/_buttons.scss @@ -58,21 +58,21 @@ } } -@mixin button-outline-variant($color) { +@mixin button-outline-variant($color, $color-hover: #fff) { color: $color; background-image: none; background-color: transparent; border-color: $color; @include hover { - color: #fff; + color: $color-hover; background-color: $color; border-color: $color; } &:focus, &.focus { - color: #fff; + color: $color-hover; background-color: $color; border-color: $color; } @@ -80,14 +80,14 @@ &:active, &.active, .open > &.dropdown-toggle { - color: #fff; + color: $color-hover; background-color: $color; border-color: $color; &:hover, &:focus, &.focus { - color: #fff; + color: $color-hover; background-color: darken($color, 17%); border-color: darken($color, 25%); } From b3944c2334e8190a44a5b329fb1ac5a33cfcd99b Mon Sep 17 00:00:00 2001 From: judetucker Date: Thu, 27 Oct 2016 15:03:45 -0700 Subject: [PATCH 2/2] cleaned up the docs to complete the change from tag to badge --- docs/components/badge.md | 12 ++++++------ docs/components/list-group.md | 10 +++++----- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/docs/components/badge.md b/docs/components/badge.md index 71b550f3b6..55a6df4f7d 100644 --- a/docs/components/badge.md +++ b/docs/components/badge.md @@ -41,10 +41,10 @@ Add any of the below mentioned modifier classes to change the appearance of a ba Use the `.badge-pill` modifier class to make badges more rounded (with a larger `border-radius` and additional horizontal `padding`). Useful if you miss the badges from v3. {% example html %} -Default -Primary -Success -Info -Warning -Danger +Default +Primary +Success +Info +Warning +Danger {% endexample %} diff --git a/docs/components/list-group.md b/docs/components/list-group.md index a043474558..bc7c8b1948 100644 --- a/docs/components/list-group.md +++ b/docs/components/list-group.md @@ -25,22 +25,22 @@ The most basic list group is simply an unordered list with list items, and the p {% endexample %} -## Tags +## Badge -Add tags to any list group item to show unread counts, activity, etc. +Add badges to any list group item to show unread counts, activity, etc. {% example html %}