From 0caab585f557513f936f4664ad1cdbddbfde9add Mon Sep 17 00:00:00 2001
From: Salman Javed <salman.javed@confiz.com>
Date: Wed, 24 Jul 2013 13:39:16 +0500
Subject: issues fixed for nav-justified on pills on android default browser.

---
 dist/css/bootstrap.css | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

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

diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css
index 697d923a3..ab0d70615 100644
--- a/dist/css/bootstrap.css
+++ b/dist/css/bootstrap.css
@@ -2605,6 +2605,7 @@ button.close {
 }
 
 .nav-tabs.nav-justified {
+  display: table;
   width: 100%;
   border-bottom: 0;
 }
@@ -2612,7 +2613,7 @@ button.close {
 .nav-tabs.nav-justified > li {
   display: table-cell;
   float: none;
-  width: 1%;
+  width: auto;
 }
 
 .nav-tabs.nav-justified > li > a {
@@ -2657,13 +2658,14 @@ button.close {
 }
 
 .nav-justified {
+  display: table;
   width: 100%;
 }
 
 .nav-justified > li {
   display: table-cell;
   float: none;
-  width: 1%;
+  width: auto;
 }
 
 .nav-justified > li > a {
-- 
cgit v1.2.3


From 7e9532dabe7ae1136c9ee07b33ee5116bcfafac1 Mon Sep 17 00:00:00 2001
From: liuyl <lyl890808@gmail.com>
Date: Wed, 24 Jul 2013 17:10:27 +0800
Subject: set cursor to not-allowed for disabled elements

---
 dist/css/bootstrap.css | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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

diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css
index 697d923a3..06c377142 100644
--- a/dist/css/bootstrap.css
+++ b/dist/css/bootstrap.css
@@ -2219,7 +2219,7 @@ input[type="button"].btn-block {
 .dropdown-menu > .disabled > a:hover,
 .dropdown-menu > .disabled > a:focus {
   text-decoration: none;
-  cursor: default;
+  cursor: not-allowed;
   background-color: transparent;
   background-image: none;
   filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
@@ -2540,7 +2540,7 @@ button.close {
 .nav > li.disabled > a:focus {
   color: #999999;
   text-decoration: none;
-  cursor: default;
+  cursor: not-allowed;
   background-color: transparent;
 }
 
@@ -3301,7 +3301,7 @@ button.close {
 .pagination > .disabled > a:hover,
 .pagination > .disabled > a:focus {
   color: #999999;
-  cursor: default;
+  cursor: not-allowed;
   background-color: #ffffff;
 }
 
@@ -3402,7 +3402,7 @@ button.close {
 .pager .disabled > a:focus,
 .pager .disabled > span {
   color: #999999;
-  cursor: default;
+  cursor: not-allowed;
   background-color: #ffffff;
 }
 
-- 
cgit v1.2.3


From c63489def3af052b37608442dc5fd1d5c9f7b6c5 Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Wed, 24 Jul 2013 16:28:34 -0700
Subject: run make on prev commits

---
 dist/css/bootstrap.css | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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

diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css
index 697d923a3..c77092ed2 100644
--- a/dist/css/bootstrap.css
+++ b/dist/css/bootstrap.css
@@ -3444,8 +3444,8 @@ button.close {
 
 .modal-content {
   position: relative;
-  background-color: #fff;
-  border: 1px solid #999;
+  background-color: #ffffff;
+  border: 1px solid #999999;
   border: 1px solid rgba(0, 0, 0, 0.2);
   border-radius: 6px;
   outline: none;
@@ -3461,7 +3461,7 @@ button.close {
   bottom: 0;
   left: 0;
   z-index: 1030;
-  background-color: #000;
+  background-color: #000000;
 }
 
 .modal-backdrop.fade {
-- 
cgit v1.2.3


From 51de38e5b9f1df43e56166cea979b18108e98350 Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Wed, 24 Jul 2013 16:52:47 -0700
Subject: make again

---
 dist/css/bootstrap.css | 13 +++++++++++++
 1 file changed, 13 insertions(+)

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

diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css
index 418a2663f..ba4966f9f 100644
--- a/dist/css/bootstrap.css
+++ b/dist/css/bootstrap.css
@@ -2672,6 +2672,19 @@ button.close {
   text-align: center;
 }
 
+.nav-tabs-justified {
+  border-bottom: 0;
+}
+
+.nav-tabs-justified > li > a {
+  margin-right: 0;
+  border-bottom: 1px solid #ddd;
+}
+
+.nav-tabs-justified > .active > a {
+  border-bottom-color: #ffffff;
+}
+
 .tabbable:before,
 .tabbable:after {
   display: table;
-- 
cgit v1.2.3