From f18a4cdadd350ca56ca7e75477fe202fcd843c53 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 23 Jan 2017 23:58:22 -0800 Subject: Allow flex-based navs to wrap like they used to (#21824) --- scss/_nav.scss | 1 + 1 file changed, 1 insertion(+) (limited to 'scss/_nav.scss') diff --git a/scss/_nav.scss b/scss/_nav.scss index eb316bb27..5e32c0d0a 100644 --- a/scss/_nav.scss +++ b/scss/_nav.scss @@ -5,6 +5,7 @@ .nav { display: flex; + flex-wrap: wrap; padding-left: 0; margin-bottom: 0; list-style: none; -- cgit v1.2.3 From 6aad73ac6d07082e607986339661a8e9f5dc0c93 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 24 Jan 2017 21:06:22 -0800 Subject: Remove random cursor: default from pill nav (#21835) Fixes #21560. Pretty sure this wasn't intentional, so should be fine to remove. --- scss/_nav.scss | 1 - 1 file changed, 1 deletion(-) (limited to 'scss/_nav.scss') diff --git a/scss/_nav.scss b/scss/_nav.scss index 5e32c0d0a..caa7ac1c9 100644 --- a/scss/_nav.scss +++ b/scss/_nav.scss @@ -81,7 +81,6 @@ .nav-link.active, .nav-item.show .nav-link { color: $nav-pills-active-link-color; - cursor: default; background-color: $nav-pills-active-link-bg; } } -- cgit v1.2.3 From e02597519aaad4643c87a3b9a77a2d0ff10b27ab Mon Sep 17 00:00:00 2001 From: Sean Beyer Date: Fri, 3 Mar 2017 11:15:41 -0800 Subject: Remove 'hover' from nav-tabs-active-link-hover-color et al (#22087) * Remove 'hover' from variable names * Fix indentation in variables --- scss/_nav.scss | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'scss/_nav.scss') diff --git a/scss/_nav.scss b/scss/_nav.scss index caa7ac1c9..7d902a7c0 100644 --- a/scss/_nav.scss +++ b/scss/_nav.scss @@ -55,9 +55,9 @@ .nav-link.active, .nav-item.show .nav-link { - color: $nav-tabs-active-link-hover-color; - 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; + color: $nav-tabs-active-link-color; + background-color: $nav-tabs-active-link-bg; + border-color: $nav-tabs-active-link-border-color $nav-tabs-active-link-border-color $nav-tabs-active-link-bg; } .dropdown-menu { -- cgit v1.2.3