From d3042cdbc8ecebc5608b0df79b77e76651a02fd0 Mon Sep 17 00:00:00 2001 From: Isshu Rakusai Date: Wed, 13 Mar 2019 17:28:13 +0900 Subject: [PATCH 1/3] =?UTF-8?q?border=E3=81=AE=E3=81=82=E3=82=8Bbtn?= =?UTF-8?q?=E3=81=AEhover=E3=81=AF=E3=81=84=E3=82=89=E3=81=AA=E3=81=84=3F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/stylesheets/bootstrap/_navs.scss | 23 ++++------------ .../bootstrap/mixins/_buttons.scss | 27 +++---------------- 2 files changed, 8 insertions(+), 42 deletions(-) diff --git a/assets/stylesheets/bootstrap/_navs.scss b/assets/stylesheets/bootstrap/_navs.scss index a31616b715..a01e17d5cc 100644 --- a/assets/stylesheets/bootstrap/_navs.scss +++ b/assets/stylesheets/bootstrap/_navs.scss @@ -33,7 +33,6 @@ [data-focus-visible] &:focus { color: $nav-link-color; text-decoration: none; - background-color: $nav-link-hover-bg; } } @@ -106,27 +105,15 @@ border-radius: 0; background-color: $nav-tabs-link-bg; color: $nav-tabs-link-color; - - &:active, - [data-hover-visible] &:hover, - [data-focus-visible] &:focus { - color: $nav-tabs-link-color; - background-color: $nav-tabs-link-hover-bg; - } } // Active state, and its :hover to override normal :hover &.active > a { - &, - &:active, - [data-hover-visible] &:hover, - [data-focus-visible] &:focus { - color: $nav-tabs-active-link-hover-color; - background-color: $nav-tabs-active-link-hover-bg; - border: 1px solid $nav-tabs-active-link-hover-border-color; - border-bottom-color: $nav-tabs-active-link-hover-bg; - cursor: default; - } + color: $nav-tabs-active-link-hover-color; + background-color: $nav-tabs-active-link-hover-bg; + border: 1px solid $nav-tabs-active-link-hover-border-color; + border-bottom-color: $nav-tabs-active-link-hover-bg; + cursor: default; } diff --git a/assets/stylesheets/bootstrap/mixins/_buttons.scss b/assets/stylesheets/bootstrap/mixins/_buttons.scss index ef10d2c35c..e0e39e17aa 100644 --- a/assets/stylesheets/bootstrap/mixins/_buttons.scss +++ b/assets/stylesheets/bootstrap/mixins/_buttons.scss @@ -7,17 +7,11 @@ color: $color; background-color: $background; border-color: $border; + border-bottom-color: darken($border, 5%); + [data-hover-visible] &:hover, [data-focus-visible] &:focus { color: $color; - background-color: darken($background, 5%); - border-color: darken($border, 5%); - } - - [data-hover-visible] &:hover { - color: $color; - background-color: darken($background, 5%); - border-color: darken($border, 5%); } &:active, @@ -26,28 +20,13 @@ color: $color; background-color: darken($background, 10%); border-color: darken($border, 10%); - - [data-hover-visible] &:hover, - [data-focus-visible] &:focus { - color: $color; - background-color: darken($background, 10%); - border-color: darken($border, 10%); - } + border-top-color: darken($border, 15%); } &:active, &.active, .open > &.dropdown-toggle { background-image: none; } - &.disabled, - &[disabled], - fieldset[disabled] & { - [data-hover-visible] &:hover, - [data-focus-visible] &:focus { - background-color: $background; - border-color: $border; - } - } .badge { color: $background; From e78004d0b4c4a84b57ccc44dd72e2fc18548266c Mon Sep 17 00:00:00 2001 From: Isshu Rakusai Date: Wed, 13 Mar 2019 17:32:33 +0900 Subject: [PATCH 2/3] =?UTF-8?q?nav=E3=81=AEborder=E3=81=AA=E3=81=97?= =?UTF-8?q?=E3=81=AB=E3=81=AFhover=E3=81=A4=E3=81=91=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/stylesheets/bootstrap/_navs.scss | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/assets/stylesheets/bootstrap/_navs.scss b/assets/stylesheets/bootstrap/_navs.scss index a01e17d5cc..a53a19f53c 100644 --- a/assets/stylesheets/bootstrap/_navs.scss +++ b/assets/stylesheets/bootstrap/_navs.scss @@ -33,6 +33,7 @@ [data-focus-visible] &:focus { color: $nav-link-color; text-decoration: none; + background-color: $nav-link-hover-bg; } } @@ -109,11 +110,16 @@ // Active state, and its :hover to override normal :hover &.active > a { - color: $nav-tabs-active-link-hover-color; - background-color: $nav-tabs-active-link-hover-bg; - border: 1px solid $nav-tabs-active-link-hover-border-color; - border-bottom-color: $nav-tabs-active-link-hover-bg; - cursor: default; + &, + &:active, + [data-hover-visible] &:hover, + [data-focus-visible] &:focus { + color: $nav-tabs-active-link-hover-color; + background-color: $nav-tabs-active-link-hover-bg; + border: 1px solid $nav-tabs-active-link-hover-border-color; + border-bottom-color: $nav-tabs-active-link-hover-bg; + cursor: default; + } } From f724de1adeab4caa0a655d08c4b25cbbd62dea65 Mon Sep 17 00:00:00 2001 From: Isshu Rakusai Date: Wed, 13 Mar 2019 17:35:35 +0900 Subject: [PATCH 3/3] =?UTF-8?q?dropdown=20menu=E3=81=AEhover=E3=81=AF?= =?UTF-8?q?=E9=9D=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/stylesheets/bootstrap/_variables.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/assets/stylesheets/bootstrap/_variables.scss b/assets/stylesheets/bootstrap/_variables.scss index 708894db3e..d233760730 100644 --- a/assets/stylesheets/bootstrap/_variables.scss +++ b/assets/stylesheets/bootstrap/_variables.scss @@ -254,9 +254,9 @@ $dropdown-divider-bg: #e5e5e5 !default; //** Dropdown link text color. $dropdown-link-color: $text-color !default; //** Hover color for dropdown links. -$dropdown-link-hover-color: darken($text-color, 5%) !default; +$dropdown-link-hover-color: $component-active-color !default; //** Hover background for dropdown links. -$dropdown-link-hover-bg: #f5f5f5 !default; +$dropdown-link-hover-bg: $component-active-bg !default; //** Active dropdown menu item text color. $dropdown-link-active-color: $component-active-color !default;