Merge branch 'master' into derp

Conflicts:
	Gruntfile.js
	_config.yml
	dist/css/bootstrap-theme.css
	dist/css/bootstrap-theme.css.map
	dist/css/bootstrap-theme.min.css
	dist/css/bootstrap.css
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/_includes/components/button-groups.html
	docs/_includes/components/jumbotron.html
	docs/_includes/components/media.html
	docs/_includes/components/navs.html
	docs/_includes/customizer-variables.html
	docs/_includes/footer.html
	docs/_includes/getting-started/browser-device-support.html
	docs/_includes/js/carousel.html
	docs/_includes/js/dropdowns.html
	docs/_includes/js/modal.html
	docs/_includes/js/popovers.html
	docs/_includes/js/tooltips.html
	docs/_includes/nav/getting-started.html
	docs/_includes/nav/javascript.html
	docs/_layouts/default.html
	docs/assets/css/docs.min.css
	docs/assets/css/src/docs.css
	docs/assets/js/customize.min.js
	docs/assets/js/docs.min.js
	docs/assets/js/raw-files.min.js
	docs/browser-bugs.html
	docs/dist/css/bootstrap-theme.css
	docs/dist/css/bootstrap-theme.css.map
	docs/dist/css/bootstrap-theme.min.css
	docs/dist/css/bootstrap.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
	docs/examples/justified-nav/index.html
	less/_forms.less
	less/_tooltip.less
	less/navs.less
	less/theme.less

14 files changed, 57 insertions, 60 deletions

diff --git a/less/_badge.less b/less/_badge.less
index 986541a3b..ddad00541 100644
--- a/less/_badge.less
+++ b/less/_badge.less
@@ -39,11 +39,17 @@
   }
 
   // Account for badges in navs
-  a.list-group-item.active > &,
+  .list-group-item.active > &,
   .nav-pills > .active > a > & {
     color: @badge-active-color;
     background-color: @badge-active-bg;
   }
+  .list-group-item > & {
+    float: right;
+  }
+  .list-group-item > & + & {
+    margin-right: 5px;
+  }
   .nav-pills > li > a > & {
     margin-left: 3px;
   }
diff --git a/less/_buttons.less b/less/_buttons.less
index bef3779a4..9c8e4ea37 100644
--- a/less/_buttons.less
+++ b/less/_buttons.less
@@ -46,7 +46,7 @@
   &.disabled,
   &[disabled],
   fieldset[disabled] & {
-    cursor: not-allowed;
+    cursor: @cursor-disabled;
     pointer-events: none; // Future-proof disabling of clicks
     opacity: .65;
     .box-shadow(none);
diff --git a/less/_dropdown.less b/less/_dropdown.less
index 1e094d7d3..56b8b4c40 100644
--- a/less/_dropdown.less
+++ b/less/_dropdown.less
@@ -104,7 +104,7 @@
     background-color: transparent;
     background-image: none; // Remove CSS gradient
     .reset-filter();
-    cursor: not-allowed;
+    cursor: @cursor-disabled;
   }
 }
 
diff --git a/less/_forms.less b/less/_forms.less
index 5b1187c5a..ff4e4bbcf 100644
--- a/less/_forms.less
+++ b/less/_forms.less
@@ -142,7 +142,7 @@ output {
   &[disabled],
   &[readonly],
   fieldset[disabled] & {
-    cursor: not-allowed;
+    cursor: @cursor-disabled;
     background-color: @input-bg-disabled;
     opacity: 1; // iOS fix for unreadable disabled content
   }
@@ -171,41 +171,28 @@ input[type="search"] {
 // Special styles for iOS temporal inputs
 //
 // In Mobile Safari, setting `display: block` on temporal inputs causes the
-// text within the input to become vertically misaligned.
-// As a workaround, we set a pixel line-height that matches the
-// given height of the input. Since this fucks up everything else, we have to
-// appropriately reset it for Internet Explorer and the size variations.
-
-input[type="date"],
-input[type="time"],
-input[type="datetime-local"],
-input[type="month"] {
-  line-height: @input-height-base;
-  // IE9+ misaligns the text within date inputs, so we reset
-  line-height: @line-height-base ~"\0";
-
-  &.input-sm {
-    line-height: @input-height-sm;
-    line-height: @line-height-sm ~"\0";
+// text within the input to become vertically misaligned. As a workaround, we
+// set a pixel line-height that matches the given height of the input, but only
+// for Safari.
+
+@media screen and (-webkit-min-device-pixel-ratio: 0) {
+  input[type="date"],
+  input[type="time"],
+  input[type="datetime-local"],
+  input[type="month"] {
+    line-height: @input-height-base;
   }
-  &.input-lg {
-    line-height: @input-height-lg;
-    line-height: @line-height-lg ~"\0";
-  }
-}
-
-// IE 11 hack to reverse the iOS temporal input hack.
-_:-ms-fullscreen, :root input[type="date"],
-_:-ms-fullscreen, :root input[type="time"],
-_:-ms-fullscreen, :root input[type="datetime-local"],
-_:-ms-fullscreen, :root input[type="month"] {
-  line-height: @line-height-base;
-
-  &.input-sm {
-    line-height: @line-height-sm;
+  input[type="date"].input-sm,
+  input[type="time"].input-sm,
+  input[type="datetime-local"].input-sm,
+  input[type="month"].input-sm {
+    line-height: @input-height-small;
   }
-  &.input-lg {
-    line-height: @line-height-lg;
+  input[type="date"].input-lg,
+  input[type="time"].input-lg,
+  input[type="datetime-local"].input-lg,
+  input[type="month"].input-lg {
+    line-height: @input-height-large;
   }
 }
 
@@ -278,7 +265,7 @@ input[type="checkbox"] {
   &[disabled],
   &.disabled,
   fieldset[disabled] & {
-    cursor: not-allowed;
+    cursor: @cursor-disabled;
   }
 }
 // These classes are used directly on <label>s
@@ -286,7 +273,7 @@ input[type="checkbox"] {
 .checkbox-inline {
   &.disabled,
   fieldset[disabled] & {
-    cursor: not-allowed;
+    cursor: @cursor-disabled;
   }
 }
 // These classes are used on elements with <label> descendants
@@ -295,7 +282,7 @@ input[type="checkbox"] {
   &.disabled,
   fieldset[disabled] & {
     label {
-      cursor: not-allowed;
+      cursor: @cursor-disabled;
     }
   }
 }
diff --git a/less/_list-group.less b/less/_list-group.less
index 1e62d3b94..1462ce16b 100644
--- a/less/_list-group.less
+++ b/less/_list-group.less
@@ -35,14 +35,6 @@
     margin-bottom: 0;
     .border-bottom-radius(@list-group-border-radius);
   }
-
-  // Align badges within list items
-  > .badge {
-    float: right;
-  }
-  > .badge + .badge {
-    margin-right: 5px;
-  }
 }
 
 
@@ -74,7 +66,7 @@ a.list-group-item {
   &.disabled:focus {
     background-color: @list-group-disabled-bg;
     color: @list-group-disabled-color;
-    cursor: not-allowed;
+    cursor: @cursor-disabled;
 
     // Force color to inherit for custom content
     .list-group-item-heading {
diff --git a/less/_modal.less b/less/_modal.less
index fb05445d3..d8f234f10 100644
--- a/less/_modal.less
+++ b/less/_modal.less
@@ -61,10 +61,9 @@
 
 // Modal background
 .modal-backdrop {
-  position: fixed;
+  position: absolute;
   top: 0;
   right: 0;
-  bottom: 0;
   left: 0;
   background-color: @modal-backdrop-bg;
   // Fade for backdrop
diff --git a/less/_nav.less b/less/_nav.less
index fa87fec25..70e79ea5b 100644
--- a/less/_nav.less
+++ b/less/_nav.less
@@ -34,7 +34,7 @@
     &:focus {
       color: @nav-disabled-link-hover-color;
       background-color: transparent;
-      cursor: not-allowed;
+      cursor: @cursor-disabled;
     }
   }
 }
diff --git a/less/_navbar.less b/less/_navbar.less
index 0967ff95c..df3260a34 100644
--- a/less/_navbar.less
+++ b/less/_navbar.less
@@ -354,6 +354,7 @@
 }
 // Menu position and menu caret support for dropups via extra dropup class
 .navbar-fixed-bottom .navbar-nav > li > .dropdown-menu {
+  .border-top-radius(@navbar-border-radius);
   .border-bottom-radius(0);
 }
 
diff --git a/less/_pager.less b/less/_pager.less
index 73a660d64..41abaaadc 100644
--- a/less/_pager.less
+++ b/less/_pager.less
@@ -48,7 +48,7 @@
     > span {
       color: @pager-disabled-color;
       background-color: @pager-bg;
-      cursor: not-allowed;
+      cursor: @cursor-disabled;
     }
   }
 }
diff --git a/less/_pagination.less b/less/_pagination.less
index 333b85461..66a1fa9b7 100644
--- a/less/_pagination.less
+++ b/less/_pagination.less
@@ -69,7 +69,7 @@
       color: @pagination-disabled-color;
       background-color: @pagination-disabled-bg;
       border-color: @pagination-disabled-border;
-      cursor: not-allowed;
+      cursor: @cursor-disabled;
     }
   }
 }
diff --git a/less/_popover.less b/less/_popover.less
index 9df04d2c8..622061721 100644
--- a/less/_popover.less
+++ b/less/_popover.less
@@ -12,6 +12,7 @@
   max-width: @popover-max-width;
   padding: 1px;
   // Reset font and text propertes given new insertion method
+  font-family: @font-family-base;
   font-size: @font-size-base;
   font-weight: normal;
   line-height: @line-height-base;
diff --git a/less/_tooltip.less b/less/_tooltip.less
index 5561b4db6..da6787cd4 100644
--- a/less/_tooltip.less
+++ b/less/_tooltip.less
@@ -9,7 +9,10 @@
   z-index: @zindex-tooltip;
   display: block;
   visibility: visible;
+  // Reset font and text propertes given new insertion method
+  font-family: @font-family-base;
   font-size: @font-size-sm;
+  font-weight: normal;
   line-height: 1.4;
   opacity: 0;
 
@@ -39,6 +42,7 @@
   border-color: transparent;
   border-style: solid;
 }
+// Note: Deprecated .top-left, .top-right, .bottom-left, and .bottom-right as of v3.3.1
 .tooltip {
   &.top .tooltip-arrow {
     bottom: 0;
@@ -49,13 +53,15 @@
   }
   &.top-left .tooltip-arrow {
     bottom: 0;
-    left: @tooltip-arrow-width;
+    right: @tooltip-arrow-width;
+    margin-bottom: -@tooltip-arrow-width;
     border-width: @tooltip-arrow-width @tooltip-arrow-width 0;
     border-top-color: @tooltip-arrow-color;
   }
   &.top-right .tooltip-arrow {
     bottom: 0;
-    right: @tooltip-arrow-width;
+    left: @tooltip-arrow-width;
+    margin-bottom: -@tooltip-arrow-width;
     border-width: @tooltip-arrow-width @tooltip-arrow-width 0;
     border-top-color: @tooltip-arrow-color;
   }
@@ -82,13 +88,15 @@
   }
   &.bottom-left .tooltip-arrow {
     top: 0;
-    left: @tooltip-arrow-width;
+    right: @tooltip-arrow-width;
+    margin-top: -@tooltip-arrow-width;
     border-width: 0 @tooltip-arrow-width @tooltip-arrow-width;
     border-bottom-color: @tooltip-arrow-color;
   }
   &.bottom-right .tooltip-arrow {
     top: 0;
-    right: @tooltip-arrow-width;
+    left: @tooltip-arrow-width;
+    margin-top: -@tooltip-arrow-width;
     border-width: 0 @tooltip-arrow-width @tooltip-arrow-width;
     border-bottom-color: @tooltip-arrow-color;
   }
diff --git a/less/_variables.less b/less/_variables.less
index 81da2b739..a72174ca0 100644
--- a/less/_variables.less
+++ b/less/_variables.less
@@ -219,6 +219,9 @@
 //** Border color for textual input addons
 @input-group-addon-border-color: @input-border;
 
+//** Disabled cursor for form controls and buttons.
+@cursor-disabled:                not-allowed;
+
 
 //== Dropdowns
 //
diff --git a/less/mixins/grid-framework.less b/less/mixins/grid-framework.less
index 631785465..f3b3929d6 100644
--- a/less/mixins/grid-framework.less
+++ b/less/mixins/grid-framework.less
@@ -5,7 +5,7 @@
 
 .make-grid-columns() {
   // Common styles for all sizes of grid columns, widths 1-12
-  .col(@index) when (@index = 1) { // initial
+  .col(@index) { // initial
     @item: ~".col-xs-@{index}, .col-sm-@{index}, .col-md-@{index}, .col-lg-@{index}";
     .col((@index + 1), @item);
   }
@@ -27,7 +27,7 @@
 }
 
 .float-grid-columns(@class) {
-  .col(@index) when (@index = 1) { // initial
+  .col(@index) { // initial
     @item: ~".col-@{class}-@{index}";
     .col((@index + 1), @item);
   }