From 0df8fae72508fd9291ccce1fb915e7eac4f83a95 Mon Sep 17 00:00:00 2001
From: Mark Otto <markdotto@gmail.com>
Date: Tue, 18 Aug 2015 20:25:35 -0700
Subject: grunt

---
 dist/css/bootstrap.css | 59 +++++++++++++++++++++-----------------------------
 1 file changed, 25 insertions(+), 34 deletions(-)

(limited to 'dist/css/bootstrap.css')

diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css
index a74dec589..908c89eaf 100644
--- a/dist/css/bootstrap.css
+++ b/dist/css/bootstrap.css
@@ -3545,14 +3545,10 @@ input[type="button"].btn-block {
   text-decoration: none;
 }
 
-.disabled > .nav-link,
 .nav-link.disabled {
   color: #818a91;
 }
 
-.disabled > .nav-link,
-.disabled > .nav-link:focus,
-.disabled > .nav-link:hover,
 .nav-link.disabled,
 .nav-link.disabled:focus,
 .nav-link.disabled:hover {
@@ -3569,6 +3565,16 @@ input[type="button"].btn-block {
   border-bottom: 1px solid #ddd;
 }
 
+.nav-tabs:before,
+.nav-tabs:after {
+  display: table;
+  content: " ";
+}
+
+.nav-tabs:after {
+  clear: both;
+}
+
 .nav-tabs .nav-item {
   float: left;
   margin-bottom: -1px;
@@ -3590,26 +3596,6 @@ input[type="button"].btn-block {
   border-color: #eceeef #eceeef #ddd;
 }
 
-.nav-tabs .open > .nav-link,
-.nav-tabs .open > .nav-link:focus,
-.nav-tabs .open > .nav-link:hover,
-.nav-tabs .active > .nav-link,
-.nav-tabs .active > .nav-link:focus,
-.nav-tabs .active > .nav-link:hover,
-.nav-tabs .nav-link.open,
-.nav-tabs .nav-link.open:focus,
-.nav-tabs .nav-link.open:hover,
-.nav-tabs .nav-link.active,
-.nav-tabs .nav-link.active:focus,
-.nav-tabs .nav-link.active:hover {
-  color: #55595c;
-  background-color: #fff;
-  border-color: #ddd #ddd transparent;
-}
-
-.nav-tabs .disabled > .nav-link,
-.nav-tabs .disabled > .nav-link:focus,
-.nav-tabs .disabled > .nav-link:hover,
 .nav-tabs .nav-link.disabled,
 .nav-tabs .nav-link.disabled:focus,
 .nav-tabs .nav-link.disabled:hover {
@@ -3618,6 +3604,17 @@ input[type="button"].btn-block {
   border-color: transparent;
 }
 
+.nav-tabs .nav-link.active,
+.nav-tabs .nav-link.active:focus,
+.nav-tabs .nav-link.active:hover,
+.nav-tabs .nav-item.open .nav-link,
+.nav-tabs .nav-item.open .nav-link:focus,
+.nav-tabs .nav-item.open .nav-link:hover {
+  color: #55595c;
+  background-color: #fff;
+  border-color: #ddd #ddd transparent;
+}
+
 .nav-pills .nav-item {
   float: left;
 }
@@ -3632,18 +3629,12 @@ input[type="button"].btn-block {
   border-radius: .25rem;
 }
 
-.nav-pills .open > .nav-link,
-.nav-pills .open > .nav-link:focus,
-.nav-pills .open > .nav-link:hover,
-.nav-pills .active > .nav-link,
-.nav-pills .active > .nav-link:focus,
-.nav-pills .active > .nav-link:hover,
-.nav-pills .nav-link.open,
-.nav-pills .nav-link.open:focus,
-.nav-pills .nav-link.open:hover,
 .nav-pills .nav-link.active,
 .nav-pills .nav-link.active:focus,
-.nav-pills .nav-link.active:hover {
+.nav-pills .nav-link.active:hover,
+.nav-pills .nav-item.open .nav-link,
+.nav-pills .nav-item.open .nav-link:focus,
+.nav-pills .nav-item.open .nav-link:hover {
   color: #fff;
   cursor: default;
   background-color: #0275d8;
-- 
cgit v1.2.3