sharpetronics/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-06-17 00:02:42 -04:00
Code Issues Projects Releases Wiki Activity

Remove plain-hover-focus mixins from navs

Browse Source 
- No need to set hover and focus on disabled or active elements. Disabled has no interactivity and active will inherit the focus.
- Also removes two now unused vars.
This commit is contained in:
Mark Otto 2016-12-28 00:03:06 -08:00 committed by Mark Otto
parent e38c3506e3
commit d6fa9f5a6c
2 changed files with 10 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
scss/_nav.scss
View File

@ -21,12 +21,7 @@
// Disabled state lightens text and removes hover/tab effects // Disabled state lightens text and removes hover/tab effects
&.disabled { &.disabled {
color: $nav-disabled-link-color; color: $nav-disabled-link-color;
cursor: $cursor-disabled;
@include plain-hover-focus {
color: $nav-disabled-link-hover-color;
cursor: $cursor-disabled;
background-color: $nav-disabled-link-hover-bg;
}
} }
} }
@ -51,21 +46,17 @@
} }
&.disabled { &.disabled {
@include plain-hover-focus { color: $nav-disabled-link-color;
color: $nav-disabled-link-color; background-color: transparent;
background-color: transparent; border-color: transparent;
border-color: transparent;
}
} }
} }
.nav-link.active, .nav-link.active,
.nav-item.open .nav-link { .nav-item.open .nav-link {
@include plain-hover-focus { color: $nav-tabs-active-link-hover-color;
color: $nav-tabs-active-link-hover-color; background-color: $nav-tabs-active-link-hover-bg;
background-color: $nav-tabs-active-link-hover-bg; border-color: $nav-tabs-active-link-hover-border-color $nav-tabs-active-link-hover-border-color $nav-tabs-active-link-hover-bg;
border-color: $nav-tabs-active-link-hover-border-color $nav-tabs-active-link-hover-border-color $nav-tabs-active-link-hover-bg;
}
} }
.dropdown-menu { .dropdown-menu {
@ -88,11 +79,9 @@
.nav-link.active, .nav-link.active,
.nav-item.open .nav-link { .nav-item.open .nav-link {
@include plain-hover-focus { color: $nav-pills-active-link-color;
color: $nav-pills-active-link-color; cursor: default;
cursor: default; background-color: $nav-pills-active-link-bg;
background-color: $nav-pills-active-link-bg;
}
} }
} }

2
scss/_variables.scss
View File

@ -638,8 +638,6 @@ $nav-item-inline-spacer: 1rem !default;
$nav-link-padding: .5em 1em !default; $nav-link-padding: .5em 1em !default;
$nav-link-hover-bg: $gray-lighter !default; $nav-link-hover-bg: $gray-lighter !default;
$nav-disabled-link-color: $gray-light !default; $nav-disabled-link-color: $gray-light !default;
$nav-disabled-link-hover-color: $gray-light !default;
$nav-disabled-link-hover-bg: transparent !default;
$nav-tabs-border-color: #ddd !default; $nav-tabs-border-color: #ddd !default;
$nav-tabs-border-width: $border-width !default; $nav-tabs-border-width: $border-width !default;