Update to Bootstrap 3.0.3

2013-12-05 19:27:34 +00:00
parent 9fca562a61
commit aa59cede7f
56 changed files with 284 additions and 344 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,11 +1,11 @@
 ### HEAD
+* Update to Bootstrap 3.0.3
 * Switch `div.main` to `main` element now that Modernizr uses the latest HTML5 Shiv
 * Update to Modernizr 2.7.0
 * Don't run JSHint on plugins (`assets/js/plugins/`)
 * Disable warnings about undefined variables (JSHint)
 * Merge in updates from HTML5 Boilerplate
 * Add JS source map (disabled by default)
-* Update to Bootstrap 3.0.2
 * Replace `grunt-recess` with `grunt-contrib-less`, add LESS source map support

 ### 6.5.1: November 5th, 2013
--- a/assets/css/main.min.css
+++ b/assets/css/main.min.css
--- a/assets/js/plugins/bootstrap/affix.js
+++ b/assets/js/plugins/bootstrap/affix.js
@@ -1,5 +1,5 @@
 /* ========================================================================
- * Bootstrap: affix.js v3.0.2
+ * Bootstrap: affix.js v3.0.3
 * http://getbootstrap.com/javascript/#affix
 * ========================================================================
 * Copyright 2013 Twitter, Inc.
--- a/assets/js/plugins/bootstrap/alert.js
+++ b/assets/js/plugins/bootstrap/alert.js
@@ -1,5 +1,5 @@
 /* ========================================================================
- * Bootstrap: alert.js v3.0.2
+ * Bootstrap: alert.js v3.0.3
 * http://getbootstrap.com/javascript/#alerts
 * ========================================================================
 * Copyright 2013 Twitter, Inc.
--- a/assets/js/plugins/bootstrap/button.js
+++ b/assets/js/plugins/bootstrap/button.js
@@ -1,5 +1,5 @@
 /* ========================================================================
- * Bootstrap: button.js v3.0.2
+ * Bootstrap: button.js v3.0.3
 * http://getbootstrap.com/javascript/#buttons
 * ========================================================================
 * Copyright 2013 Twitter, Inc.
@@ -54,15 +54,21 @@

  Button.prototype.toggle = function () {
    var $parent = this.$element.closest('[data-toggle="buttons"]')
+    var changed = true

    if ($parent.length) {
      var $input = this.$element.find('input')
-        .prop('checked', !this.$element.hasClass('active'))
-        .trigger('change')
-      if ($input.prop('type') === 'radio') $parent.find('.active').removeClass('active')
+      if ($input.prop('type') === 'radio') {
+        // see if clicking on current one
+        if ($input.prop('checked') && this.$element.hasClass('active'))
+          changed = false
+        else
+          $parent.find('.active').removeClass('active')
+      }
+      if (changed) $input.prop('checked', !this.$element.hasClass('active')).trigger('change')
    }

-    this.$element.toggleClass('active')
+    if (changed) this.$element.toggleClass('active')
  }


--- a/assets/js/plugins/bootstrap/carousel.js
+++ b/assets/js/plugins/bootstrap/carousel.js
@@ -1,5 +1,5 @@
 /* ========================================================================
- * Bootstrap: carousel.js v3.0.2
+ * Bootstrap: carousel.js v3.0.3
 * http://getbootstrap.com/javascript/#carousel
 * ========================================================================
 * Copyright 2013 Twitter, Inc.
@@ -69,7 +69,7 @@

    if (pos > (this.$items.length - 1) || pos < 0) return

-    if (this.sliding)       return this.$element.one('slid', function () { that.to(pos) })
+    if (this.sliding)       return this.$element.one('slid.bs.carousel', function () { that.to(pos) })
    if (activeIndex == pos) return this.pause().cycle()

    return this.slide(pos > activeIndex ? 'next' : 'prev', $(this.$items[pos]))
@@ -121,7 +121,7 @@

    if (this.$indicators.length) {
      this.$indicators.find('.active').removeClass('active')
-      this.$element.one('slid', function () {
+      this.$element.one('slid.bs.carousel', function () {
        var $nextIndicator = $(that.$indicators.children()[that.getActiveIndex()])
        $nextIndicator && $nextIndicator.addClass('active')
      })
@@ -139,7 +139,7 @@
          $next.removeClass([type, direction].join(' ')).addClass('active')
          $active.removeClass(['active', direction].join(' '))
          that.sliding = false
-          setTimeout(function () { that.$element.trigger('slid') }, 0)
+          setTimeout(function () { that.$element.trigger('slid.bs.carousel') }, 0)
        })
        .emulateTransitionEnd(600)
    } else {
@@ -148,7 +148,7 @@
      $active.removeClass('active')
      $next.addClass('active')
      this.sliding = false
-      this.$element.trigger('slid')
+      this.$element.trigger('slid.bs.carousel')
    }

    isCycling && this.cycle()
--- a/assets/js/plugins/bootstrap/collapse.js
+++ b/assets/js/plugins/bootstrap/collapse.js
@@ -1,5 +1,5 @@
 /* ========================================================================
- * Bootstrap: collapse.js v3.0.2
+ * Bootstrap: collapse.js v3.0.3
 * http://getbootstrap.com/javascript/#collapse
 * ========================================================================
 * Copyright 2013 Twitter, Inc.
--- a/assets/js/plugins/bootstrap/dropdown.js
+++ b/assets/js/plugins/bootstrap/dropdown.js
@@ -1,5 +1,5 @@
 /* ========================================================================
- * Bootstrap: dropdown.js v3.0.2
+ * Bootstrap: dropdown.js v3.0.3
 * http://getbootstrap.com/javascript/#dropdowns
 * ========================================================================
 * Copyright 2013 Twitter, Inc.
@@ -26,7 +26,7 @@
  var backdrop = '.dropdown-backdrop'
  var toggle   = '[data-toggle=dropdown]'
  var Dropdown = function (element) {
-    var $el = $(element).on('click.bs.dropdown', this.toggle)
+    $(element).on('click.bs.dropdown', this.toggle)
  }

  Dropdown.prototype.toggle = function (e) {
@@ -41,7 +41,7 @@

    if (!isActive) {
      if ('ontouchstart' in document.documentElement && !$parent.closest('.navbar-nav').length) {
-        // if mobile we we use a backdrop because click events don't delegate
+        // if mobile we use a backdrop because click events don't delegate
        $('<div class="dropdown-backdrop"/>').insertAfter($(this)).on('click', clearMenus)
      }

@@ -123,9 +123,9 @@
  $.fn.dropdown = function (option) {
    return this.each(function () {
      var $this = $(this)
-      var data  = $this.data('dropdown')
+      var data  = $this.data('bs.dropdown')

-      if (!data) $this.data('dropdown', (data = new Dropdown(this)))
+      if (!data) $this.data('bs.dropdown', (data = new Dropdown(this)))
      if (typeof option == 'string') data[option].call($this)
    })
  }
--- a/assets/js/plugins/bootstrap/modal.js
+++ b/assets/js/plugins/bootstrap/modal.js
@@ -1,5 +1,5 @@
 /* ========================================================================
- * Bootstrap: modal.js v3.0.2
+ * Bootstrap: modal.js v3.0.3
 * http://getbootstrap.com/javascript/#modals
 * ========================================================================
 * Copyright 2013 Twitter, Inc.
--- a/assets/js/plugins/bootstrap/popover.js
+++ b/assets/js/plugins/bootstrap/popover.js
@@ -1,5 +1,5 @@
 /* ========================================================================
- * Bootstrap: popover.js v3.0.2
+ * Bootstrap: popover.js v3.0.3
 * http://getbootstrap.com/javascript/#popovers
 * ========================================================================
 * Copyright 2013 Twitter, Inc.
--- a/assets/js/plugins/bootstrap/scrollspy.js
+++ b/assets/js/plugins/bootstrap/scrollspy.js
@@ -1,5 +1,5 @@
 /* ========================================================================
- * Bootstrap: scrollspy.js v3.0.2
+ * Bootstrap: scrollspy.js v3.0.3
 * http://getbootstrap.com/javascript/#scrollspy
 * ========================================================================
 * Copyright 2013 Twitter, Inc.
@@ -113,7 +113,7 @@
        .addClass('active')
    }

-    active.trigger('activate')
+    active.trigger('activate.bs.scrollspy')
  }


--- a/assets/js/plugins/bootstrap/tab.js
+++ b/assets/js/plugins/bootstrap/tab.js
@@ -1,5 +1,5 @@
 /* ========================================================================
- * Bootstrap: tab.js v3.0.2
+ * Bootstrap: tab.js v3.0.3
 * http://getbootstrap.com/javascript/#tabs
 * ========================================================================
 * Copyright 2013 Twitter, Inc.
--- a/assets/js/plugins/bootstrap/tooltip.js
+++ b/assets/js/plugins/bootstrap/tooltip.js
@@ -1,5 +1,5 @@
 /* ========================================================================
- * Bootstrap: tooltip.js v3.0.2
+ * Bootstrap: tooltip.js v3.0.3
 * http://getbootstrap.com/javascript/#tooltip
 * Inspired by the original jQuery.tipsy by Jason Frame
 * ========================================================================
--- a/assets/js/plugins/bootstrap/transition.js
+++ b/assets/js/plugins/bootstrap/transition.js
@@ -1,5 +1,5 @@
 /* ========================================================================
- * Bootstrap: transition.js v3.0.2
+ * Bootstrap: transition.js v3.0.3
 * http://getbootstrap.com/javascript/#transitions
 * ========================================================================
 * Copyright 2013 Twitter, Inc.
--- a/assets/js/scripts.min.js
+++ b/assets/js/scripts.min.js
--- a/assets/less/bootstrap/alerts.less
+++ b/assets/less/bootstrap/alerts.less
--- a/assets/less/bootstrap/badges.less
+++ b/assets/less/bootstrap/badges.less
@@ -22,6 +22,12 @@
  &:empty {
    display: none;
  }
+
+  // Quick fix for badges in buttons
+  .btn & {
+    position: relative;
+    top: -1px;
+  }
 }

 // Hover state, but only for links
@@ -34,12 +40,6 @@ a.badge {
  }
 }

-// Quick fix for labels/badges in buttons
-.btn .badge {
-  position: relative;
-  top: -1px;
-}
-
 // Account for counters in navs
 a.list-group-item.active > .badge,
 .nav-pills > .active > a > .badge {
--- a/assets/less/bootstrap/bootstrap.less
+++ b/assets/less/bootstrap/bootstrap.less
--- a/assets/less/bootstrap/breadcrumbs.less
+++ b/assets/less/bootstrap/breadcrumbs.less
--- a/assets/less/bootstrap/button-groups.less
+++ b/assets/less/bootstrap/button-groups.less
@@ -2,37 +2,6 @@
 // Button groups
 // --------------------------------------------------

-// Button carets
-//
-// Match the button text color to the arrow/caret for indicating dropdown-ness.
-
-.caret {
-  .btn-default & {
-    border-top-color: @btn-default-color;
-  }
-  .btn-primary &,
-  .btn-success &,
-  .btn-warning &,
-  .btn-danger &,
-  .btn-info & {
-    border-top-color: #fff;
-  }
-}
-.dropup {
-  .btn-default .caret {
-    border-bottom-color: @btn-default-color;
-  }
-  .btn-primary,
-  .btn-success,
-  .btn-warning,
-  .btn-danger,
-  .btn-info {
-   .caret {
-      border-bottom-color: #fff;
-    }
-  }
-}
-
 // Make the div behave like a button
 .btn-group,
 .btn-group-vertical {
@@ -178,7 +147,8 @@

 .btn-group-vertical {
  > .btn,
-  > .btn-group {
+  > .btn-group,
+  > .btn-group > .btn {
    display: block;
    float: none;
    width: 100%;
@@ -238,11 +208,15 @@
  width: 100%;
  table-layout: fixed;
  border-collapse: separate;
-  .btn {
+  > .btn,
+  > .btn-group {
    float: none;
    display: table-cell;
    width: 1%;
  }
+  > .btn-group .btn {
+    width: 100%;
+  }
 }


--- a/assets/less/bootstrap/buttons.less
+++ b/assets/less/bootstrap/buttons.less
@@ -6,7 +6,6 @@
 // Base styles
 // --------------------------------------------------

-// Core styles
 .btn {
  display: inline-block;
  margin-bottom: 0; // For input.btn
@@ -45,7 +44,6 @@
    .opacity(.65);
    .box-shadow(none);
  }
-
 }


@@ -123,13 +121,12 @@
  // line-height: ensure even-numbered height of button next to large input
  .button-size(@padding-large-vertical; @padding-large-horizontal; @font-size-large; @line-height-large; @border-radius-large);
 }
-.btn-sm,
-.btn-xs {
+.btn-sm {
  // line-height: ensure proper height of button next to small input
  .button-size(@padding-small-vertical; @padding-small-horizontal; @font-size-small; @line-height-small; @border-radius-small);
 }
 .btn-xs {
-  padding: 1px 5px;
+  .button-size(@padding-xs-vertical; @padding-xs-horizontal; @font-size-small; @line-height-small; @border-radius-small);
 }


--- a/assets/less/bootstrap/carousel.less
+++ b/assets/less/bootstrap/carousel.less
@@ -91,6 +91,7 @@
  // Hover/focus state
  &:hover,
  &:focus {
+    outline: none;
    color: @carousel-control-color;
    text-decoration: none;
    .opacity(.9);
--- a/assets/less/bootstrap/close.less
+++ b/assets/less/bootstrap/close.less
--- a/assets/less/bootstrap/code.less
+++ b/assets/less/bootstrap/code.less
--- a/assets/less/bootstrap/component-animations.less
+++ b/assets/less/bootstrap/component-animations.less
--- a/assets/less/bootstrap/dropdowns.less
+++ b/assets/less/bootstrap/dropdowns.less
@@ -10,12 +10,9 @@
  height: 0;
  margin-left: 2px;
  vertical-align: middle;
-  border-top:   @caret-width-base solid @dropdown-caret-color;
+  border-top:   @caret-width-base solid;
  border-right: @caret-width-base solid transparent;
  border-left:  @caret-width-base solid transparent;
-  // Firefox fix for https://github.com/twbs/bootstrap/issues/9538. Once fixed,
-  // we can just straight up remove this.
-  border-bottom: 0 dotted;
 }

 // The dropdown wrapper (div)
@@ -163,10 +160,8 @@
 .navbar-fixed-bottom .dropdown {
  // Reverse the caret
  .caret {
-    // Firefox fix for https://github.com/twbs/bootstrap/issues/9538. Once this
-    // gets fixed, restore `border-top: 0;`.
-    border-top: 0 dotted;
-    border-bottom: @caret-width-base solid @dropdown-caret-color;
+    border-top: 0;
+    border-bottom: @caret-width-base solid;
    content: "";
  }
  // Different positioning for bottom up menu
--- a/assets/less/bootstrap/forms.less
+++ b/assets/less/bootstrap/forms.less
@@ -309,6 +309,11 @@ input[type="checkbox"],
      display: inline-block;
    }

+    // Override `width: 100%;` when not within a `.form-group`
+    select.form-control {
+      width: auto;
+    }
+
    // Remove default margin on radios/checkboxes that were used for stacking, and
    // then undo the floating of radios and checkboxes to match (which also avoids
    // a bug in WebKit: https://github.com/twbs/bootstrap/issues/1969).
@@ -345,6 +350,12 @@ input[type="checkbox"],
    margin-bottom: 0;
    padding-top: (@padding-base-vertical + 1); // Default padding plus a border
  }
+  // Account for padding we're adding to ensure the alignment and of help text
+  // and other content below items
+  .radio,
+  .checkbox {
+    min-height: @line-height-computed + (@padding-base-vertical + 1);
+  }

  // Make form groups behave like rows
  .form-group {
--- a/assets/less/bootstrap/glyphicons.less
+++ b/assets/less/bootstrap/glyphicons.less
@@ -10,11 +10,11 @@
 // Import the fonts
@font-face {
  font-family: 'Glyphicons Halflings';
-  src: url('@{icon-font-path}@{icon-font-name}.eot');
-  src: url('@{icon-font-path}@{icon-font-name}.eot?#iefix') format('embedded-opentype'),
-       url('@{icon-font-path}@{icon-font-name}.woff') format('woff'),
-       url('@{icon-font-path}@{icon-font-name}.ttf') format('truetype'),
-       url('@{icon-font-path}@{icon-font-name}.svg#glyphicons_halflingsregular') format('svg');
+  src: ~"url('@{icon-font-path}@{icon-font-name}.eot')";
+  src: ~"url('@{icon-font-path}@{icon-font-name}.eot?#iefix') format('embedded-opentype')",
+       ~"url('@{icon-font-path}@{icon-font-name}.woff') format('woff')",
+       ~"url('@{icon-font-path}@{icon-font-name}.ttf') format('truetype')",
+       ~"url('@{icon-font-path}@{icon-font-name}.svg#glyphicons-halflingsregular') format('svg')";
 }

 // Catchall baseclass
--- a/assets/less/bootstrap/grid.less
+++ b/assets/less/bootstrap/grid.less
@@ -5,6 +5,16 @@
 // Set the container width, and override it for fixed navbars in media queries
 .container {
  .container-fixed();
+
+  @media (min-width: @screen-sm) {
+    width: @container-sm;
+  }
+  @media (min-width: @screen-md) {
+    width: @container-md;
+  }
+  @media (min-width: @screen-lg-min) {
+    width: @container-lg;
+  }
 }

 // mobile first defaults
@@ -18,11 +28,8 @@

 // Extra small grid
 //
-// Grid classes for extra small devices like smartphones. No offset, push, or
-// pull classes are present here due to the size of the target.
-//
-// Note that `.col-xs-12` doesn't get floated on purpose--there's no need since
-// it's full-width.
+// Columns, offsets, pushes, and pulls for extra small devices like
+// smartphones.

 .make-grid-columns-float(xs);
 .make-grid(@grid-columns, xs, width);
@@ -35,15 +42,8 @@
 //
 // Columns, offsets, pushes, and pulls for the small device range, from phones
 // to tablets.
-//
-// Note that `.col-sm-12` doesn't get floated on purpose--there's no need since
-// it's full-width.

@media (min-width: @screen-sm-min) {
-  .container {
-    width: @container-sm;
-  }
-
  .make-grid-columns-float(sm);
  .make-grid(@grid-columns, sm, width);
  .make-grid(@grid-columns, sm, pull);
@@ -55,15 +55,8 @@
 // Medium grid
 //
 // Columns, offsets, pushes, and pulls for the desktop device range.
-//
-// Note that `.col-md-12` doesn't get floated on purpose--there's no need since
-// it's full-width.

@media (min-width: @screen-md-min) {
-  .container {
-    width: @container-md;
-  }
-
  .make-grid-columns-float(md);
  .make-grid(@grid-columns, md, width);
  .make-grid(@grid-columns, md, pull);
@@ -75,15 +68,8 @@
 // Large grid
 //
 // Columns, offsets, pushes, and pulls for the large desktop device range.
-//
-// Note that `.col-lg-12` doesn't get floated on purpose--there's no need since
-// it's full-width.

@media (min-width: @screen-lg-min) {
-  .container {
-    width: @container-lg;
-  }
-
  .make-grid-columns-float(lg);
  .make-grid(@grid-columns, lg, width);
  .make-grid(@grid-columns, lg, pull);
--- a/assets/less/bootstrap/input-groups.less
+++ b/assets/less/bootstrap/input-groups.less
@@ -10,7 +10,7 @@
  border-collapse: separate; // prevent input groups from inheriting border styles from table cells when placed within a table

  // Undo padding and float of grid classes
-  &.col {
+  &[class*="col-"] {
    float: none;
    padding-left: 0;
    padding-right: 0;
--- a/assets/less/bootstrap/jumbotron.less
+++ b/assets/less/bootstrap/jumbotron.less
@@ -12,7 +12,8 @@
  color: @jumbotron-color;
  background-color: @jumbotron-bg;

-  h1 {
+  h1,
+  .h1 {
    line-height: 1;
    color: @jumbotron-heading-color;
  }
@@ -24,6 +25,10 @@
    border-radius: @border-radius-large; // Only round corners at higher resolutions if contained in a container
  }

+  .container {
+    max-width: 100%;
+  }
+
  @media screen and (min-width: @screen-sm-min) {
    padding-top:    (@jumbotron-padding * 1.6);
    padding-bottom: (@jumbotron-padding * 1.6);
@@ -33,7 +38,8 @@
      padding-right: (@jumbotron-padding * 2);
    }

-    h1 {
+    h1,
+    .h1 {
      font-size: (@font-size-base * 4.5);
    }
  }
--- a/assets/less/bootstrap/labels.less
+++ b/assets/less/bootstrap/labels.less
@@ -28,6 +28,12 @@
  &:empty {
    display: none;
  }
+
+  // Quick fix for labels in buttons
+  .btn & {
+    position: relative;
+    top: -1px;
+  }
 }

 // Colors
--- a/assets/less/bootstrap/list-group.less
+++ b/assets/less/bootstrap/list-group.less
--- a/assets/less/bootstrap/media.less
+++ b/assets/less/bootstrap/media.less
--- a/assets/less/bootstrap/mixins.less
+++ b/assets/less/bootstrap/mixins.less
@@ -19,8 +19,8 @@
 .clearfix() {
  &:before,
  &:after {
-    content: " "; /* 1 */
-    display: table; /* 2 */
+    content: " "; // 1
+    display: table; // 2
  }
  &:after {
    clear: both;
@@ -30,7 +30,7 @@
 // WebKit-style focus
 .tab-focus() {
  // Default
-  outline: thin dotted #333;
+  outline: thin dotted;
  // WebKit
  outline: 5px auto -webkit-focus-ring-color;
  outline-offset: -2px;
@@ -55,7 +55,8 @@
 // Placeholder text
 .placeholder(@color: @input-color-placeholder) {
  &:-moz-placeholder            { color: @color; } // Firefox 4-18
-  &::-moz-placeholder           { color: @color; } // Firefox 19+
+  &::-moz-placeholder           { color: @color;   // Firefox 19+
+                                  opacity: 1; } // See https://github.com/twbs/bootstrap/pull/11526
  &:-ms-input-placeholder       { color: @color; } // Internet Explorer 10+
  &::-webkit-input-placeholder  { color: @color; } // Safari and Chrome
 }
@@ -87,11 +88,7 @@
 }
 // New mixin to use as of v3.0.1
 .text-hide() {
-  font: ~"0/0" a;
-  color: transparent;
-  text-shadow: none;
-  background-color: transparent;
-  border: 0;
+  .hide-text();
 }


@@ -277,10 +274,8 @@
  // Creates two color stops, start and end, by specifying a color and position for each color stop.
  // Color stops are not available in IE9 and below.
  .horizontal(@start-color: #555; @end-color: #333; @start-percent: 0%; @end-percent: 100%) {
-    background-image: -webkit-gradient(linear, @start-percent top, @end-percent top, from(@start-color), to(@end-color)); // Safari 4+, Chrome 2+
-    background-image: -webkit-linear-gradient(left, color-stop(@start-color @start-percent), color-stop(@end-color @end-percent)); // Safari 5.1+, Chrome 10+
-    background-image: -moz-linear-gradient(left, @start-color @start-percent, @end-color @end-percent); // FF 3.6+
-    background-image:  linear-gradient(to right, @start-color @start-percent, @end-color @end-percent); // Standard, IE10
+    background-image: -webkit-linear-gradient(left, color-stop(@start-color @start-percent), color-stop(@end-color @end-percent)); // Safari 5.1-6, Chrome 10+
+    background-image:  linear-gradient(to right, @start-color @start-percent, @end-color @end-percent); // Standard, IE10, Firefox 16+, Opera 12.10+, Safari 7+, Chrome 26+
    background-repeat: repeat-x;
    filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=1)",argb(@start-color),argb(@end-color))); // IE9 and down
  }
@@ -290,47 +285,36 @@
  // Creates two color stops, start and end, by specifying a color and position for each color stop.
  // Color stops are not available in IE9 and below.
  .vertical(@start-color: #555; @end-color: #333; @start-percent: 0%; @end-percent: 100%) {
-    background-image: -webkit-gradient(linear, left @start-percent, left @end-percent, from(@start-color), to(@end-color)); // Safari 4+, Chrome 2+
-    background-image: -webkit-linear-gradient(top, @start-color @start-percent, @end-color @end-percent); // Safari 5.1+, Chrome 10+
-    background-image:  -moz-linear-gradient(top, @start-color @start-percent, @end-color @end-percent); // FF 3.6+
-    background-image: linear-gradient(to bottom, @start-color @start-percent, @end-color @end-percent); // Standard, IE10
+    background-image: -webkit-linear-gradient(top, @start-color @start-percent, @end-color @end-percent);  // Safari 5.1-6, Chrome 10+
+    background-image: linear-gradient(to bottom, @start-color @start-percent, @end-color @end-percent); // Standard, IE10, Firefox 16+, Opera 12.10+, Safari 7+, Chrome 26+
    background-repeat: repeat-x;
    filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)",argb(@start-color),argb(@end-color))); // IE9 and down
  }

  .directional(@start-color: #555; @end-color: #333; @deg: 45deg) {
    background-repeat: repeat-x;
-    background-image: -webkit-linear-gradient(@deg, @start-color, @end-color); // Safari 5.1+, Chrome 10+
-    background-image: -moz-linear-gradient(@deg, @start-color, @end-color); // FF 3.6+
-    background-image: linear-gradient(@deg, @start-color, @end-color); // Standard, IE10
+    background-image: -webkit-linear-gradient(@deg, @start-color, @end-color); // Safari 5.1-6, Chrome 10+
+    background-image: linear-gradient(@deg, @start-color, @end-color); // Standard, IE10, Firefox 16+, Opera 12.10+, Safari 7+, Chrome 26+
  }
  .horizontal-three-colors(@start-color: #00b3ee; @mid-color: #7a43b6; @color-stop: 50%; @end-color: #c3325f) {
-    background-image: -webkit-gradient(left, linear, 0 0, 0 100%, from(@start-color), color-stop(@color-stop, @mid-color), to(@end-color));
    background-image: -webkit-linear-gradient(left, @start-color, @mid-color @color-stop, @end-color);
-    background-image: -moz-linear-gradient(left, @start-color, @mid-color @color-stop, @end-color);
    background-image: linear-gradient(to right, @start-color, @mid-color @color-stop, @end-color);
    background-repeat: no-repeat;
    filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=1)",argb(@start-color),argb(@end-color))); // IE9 and down, gets no color-stop at all for proper fallback
  }
  .vertical-three-colors(@start-color: #00b3ee; @mid-color: #7a43b6; @color-stop: 50%; @end-color: #c3325f) {
-    background-image: -webkit-gradient(linear, 0 0, 0 100%, from(@start-color), color-stop(@color-stop, @mid-color), to(@end-color));
    background-image: -webkit-linear-gradient(@start-color, @mid-color @color-stop, @end-color);
-    background-image: -moz-linear-gradient(top, @start-color, @mid-color @color-stop, @end-color);
    background-image: linear-gradient(@start-color, @mid-color @color-stop, @end-color);
    background-repeat: no-repeat;
    filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)",argb(@start-color),argb(@end-color))); // IE9 and down, gets no color-stop at all for proper fallback
  }
  .radial(@inner-color: #555; @outer-color: #333) {
-    background-image: -webkit-gradient(radial, center center, 0, center center, 460, from(@inner-color), to(@outer-color));
    background-image: -webkit-radial-gradient(circle, @inner-color, @outer-color);
-    background-image: -moz-radial-gradient(circle, @inner-color, @outer-color);
    background-image: radial-gradient(circle, @inner-color, @outer-color);
    background-repeat: no-repeat;
  }
  .striped(@color: rgba(255,255,255,.15); @angle: 45deg) {
-    background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(.25, @color), color-stop(.25, transparent), color-stop(.5, transparent), color-stop(.5, @color), color-stop(.75, @color), color-stop(.75, transparent), to(transparent));
    background-image: -webkit-linear-gradient(@angle, @color 25%, transparent 25%, transparent 50%, @color 50%, @color 75%, transparent 75%, transparent);
-    background-image: -moz-linear-gradient(@angle, @color 25%, transparent 25%, transparent 50%, @color 50%, @color 75%, transparent 75%, transparent);
    background-image: linear-gradient(@angle, @color 25%, transparent 25%, transparent 50%, @color 50%, @color 75%, transparent 75%, transparent);
  }
 }
@@ -391,7 +375,7 @@

 // Panels
 // -------------------------
-.panel-variant(@border; @heading-text-color; @heading-bg-color; @heading-border;) {
+.panel-variant(@border; @heading-text-color; @heading-bg-color; @heading-border) {
  border-color: @border;

  & > .panel-heading {
@@ -402,9 +386,6 @@
    + .panel-collapse .panel-body {
      border-top-color: @border;
    }
-    & > .dropdown .caret {
-      border-color: @heading-text-color transparent;
-    }
  }
  & > .panel-footer {
    + .panel-collapse .panel-body {
@@ -430,27 +411,27 @@

 // Tables
 // -------------------------
-.table-row-variant(@state; @background; @border) {
+.table-row-variant(@state; @background) {
  // Exact selectors below required to override `.table-striped` and prevent
  // inheritance to nested tables.
-  .table > thead > tr,
-  .table > tbody > tr,
-  .table > tfoot > tr {
-    > td.@{state},
-    > th.@{state},
-    &.@{state} > td,
-    &.@{state} > th {
-      background-color: @background;
+  .table {
+    > thead,
+    > tbody,
+    > tfoot {
+      > tr > .@{state},
+      > .@{state} > td,
+      > .@{state} > th {
+        background-color: @background;
+      }
    }
  }

  // Hover states for `.table-hover`
  // Note: this is not available for cells or rows within `thead` or `tfoot`.
-  .table-hover > tbody > tr {
-    > td.@{state}:hover,
-    > th.@{state}:hover,
-    &.@{state}:hover > td,
-    &.@{state}:hover > th {
+  .table-hover > tbody {
+    > tr > .@{state}:hover,
+    > .@{state}:hover > td,
+    > .@{state}:hover > th {
      background-color: darken(@background, 5%);
    }
  }
@@ -491,6 +472,11 @@
          border-color: @border;
    }
  }
+
+  .badge {
+    color: @background;
+    background-color: #fff;
+  }
 }

 // Button sizes
@@ -561,9 +547,10 @@
 // More easily include all the states for responsive-utilities.less.
 .responsive-visibility() {
  display: block !important;
-  tr& { display: table-row !important; }
+  table&  { display: table; }
+  tr&     { display: table-row !important; }
  th&,
-  td& { display: table-cell !important; }
+  td&     { display: table-cell !important; }
 }

 .responsive-invisibility() {
@@ -738,11 +725,11 @@
    @item: ~".col-@{class}-@{index}";
    .col(@index + 1, @item);
  }
-  .col(@index, @list) when (@index < @grid-columns) { // general
+  .col(@index, @list) when (@index =< @grid-columns) { // general
    @item: ~".col-@{class}-@{index}";
    .col(@index + 1, ~"@{list}, @{item}");
  }
-  .col(@index, @list) when (@index = @grid-columns) { // terminal
+  .col(@index, @list) when (@index > @grid-columns) { // terminal
    @{list} {
      float: left;
    }
--- a/assets/less/bootstrap/modals.less
+++ b/assets/less/bootstrap/modals.less
@@ -35,10 +35,8 @@
 // Shell div to position the modal with bottom padding
 .modal-dialog {
  position: relative;
-  margin-left: auto;
-  margin-right: auto;
  width: auto;
-  padding: 10px;
+  margin: 10px;
  z-index: (@zindex-modal-background + 10);
 }

@@ -122,8 +120,7 @@

  .modal-dialog {
    width: 600px;
-    padding-top: 30px;
-    padding-bottom: 30px;
+    margin: 30px auto;
  }
  .modal-content {
    .box-shadow(0 5px 15px rgba(0,0,0,.5));
--- a/assets/less/bootstrap/navbar.less
+++ b/assets/less/bootstrap/navbar.less
@@ -74,18 +74,16 @@
    }

    &.in {
-      overflow-y: auto;
+      overflow-y: visible;
    }

-    // Account for first and last children spacing
-    .navbar-nav.navbar-left:first-child {
-      margin-left: -@navbar-padding-horizontal;
-    }
-    .navbar-nav.navbar-right:last-child {
-      margin-right: -@navbar-padding-horizontal;
-    }
-    .navbar-text:last-child {
-      margin-right: 0;
+    // Undo the collapse side padding for navbars with containers to ensure
+    // alignment of right-aligned contents.
+    .navbar-fixed-top &,
+    .navbar-static-top &,
+    .navbar-fixed-bottom & {
+      padding-left: 0;
+      padding-right: 0;
    }
  }
 }
@@ -180,6 +178,7 @@
  padding: 9px 10px;
  .navbar-vertical-align(34px);
  background-color: transparent;
+  background-image: none; // Reset unusual Firefox-on-Android default style; see https://github.com/necolas/normalize.css/issues/214
  border: 1px solid transparent;
  border-radius: @border-radius-base;

@@ -214,7 +213,7 @@
    line-height: @line-height-computed;
  }

-  @media (max-width: @screen-xs-max) {
+  @media (max-width: @grid-float-breakpoint-max) {
    // Dropdowns get custom display when collapsed
    .open .dropdown-menu {
      position: static;
@@ -246,12 +245,15 @@
    > li {
      float: left;
      > a {
-        padding-top: ((@navbar-height - @line-height-computed) / 2);
-        padding-bottom: ((@navbar-height - @line-height-computed) / 2);
+        padding-top:    @navbar-padding-vertical;
+        padding-bottom: @navbar-padding-vertical;
      }
    }
-  }

+    &.navbar-right:last-child {
+      margin-right: -@navbar-padding-horizontal;
+    }
+  }
 }


@@ -285,7 +287,7 @@
  .form-inline();

  .form-group {
-    @media (max-width: @screen-xs-max) {
+    @media (max-width: @grid-float-breakpoint-max) {
      margin-bottom: 5px;
    }
  }
@@ -302,6 +304,11 @@
    padding-top: 0;
    padding-bottom: 0;
    .box-shadow(none);
+
+    // Outdent the form if last child to line up with content down the page
+    &.navbar-right:last-child {
+      margin-right: -@navbar-padding-horizontal;
+    }
  }
 }

@@ -332,6 +339,13 @@

 .navbar-btn {
  .navbar-vertical-align(@input-height-base);
+
+  &.btn-sm {
+    .navbar-vertical-align(@input-height-small);
+  }
+  &.btn-xs {
+    .navbar-vertical-align(22);
+  }
 }


@@ -340,12 +354,17 @@
 // Add a class to make any element properly align itself vertically within the navbars.

 .navbar-text {
-  float: left;
  .navbar-vertical-align(@line-height-computed);

  @media (min-width: @grid-float-breakpoint) {
+    float: left;
    margin-left: @navbar-padding-horizontal;
    margin-right: @navbar-padding-horizontal;
+
+    // Outdent the form if last child to line up with content down the page
+    &.navbar-right:last-child {
+      margin-right: 0;
+    }
  }
 }

@@ -414,15 +433,8 @@
    border-color: @navbar-default-border;
  }

-  // Dropdown menu items and carets
+  // Dropdown menu items
  .navbar-nav {
-    // Caret should match text color on hover
-    > .dropdown > a:hover .caret,
-    > .dropdown > a:focus .caret {
-      border-top-color: @navbar-default-link-hover-color;
-      border-bottom-color: @navbar-default-link-hover-color;
-    }
-
    // Remove background color from open dropdown
    > .open > a {
      &,
@@ -430,19 +442,10 @@
      &:focus {
        background-color: @navbar-default-link-active-bg;
        color: @navbar-default-link-active-color;
-        .caret {
-          border-top-color: @navbar-default-link-active-color;
-          border-bottom-color: @navbar-default-link-active-color;
-        }
      }
    }
-    > .dropdown > a .caret {
-      border-top-color: @navbar-default-link-color;
-      border-bottom-color: @navbar-default-link-color;
-    }

-
-    @media (max-width: @screen-xs-max) {
+    @media (max-width: @grid-float-breakpoint-max) {
      // Dropdowns get custom display when collapsed
      .open .dropdown-menu {
        > li > a {
@@ -561,31 +564,16 @@
        color: @navbar-inverse-link-active-color;
      }
    }
-    > .dropdown > a:hover .caret {
-      border-top-color: @navbar-inverse-link-hover-color;
-      border-bottom-color: @navbar-inverse-link-hover-color;
-    }
-    > .dropdown > a .caret {
-      border-top-color: @navbar-inverse-link-color;
-      border-bottom-color: @navbar-inverse-link-color;
-    }
-    > .open > a {
-      &,
-      &:hover,
-      &:focus {
-        .caret {
-          border-top-color: @navbar-inverse-link-active-color;
-          border-bottom-color: @navbar-inverse-link-active-color;
-        }
-      }
-    }

-    @media (max-width: @screen-xs-max) {
+    @media (max-width: @grid-float-breakpoint-max) {
      // Dropdowns get custom display
      .open .dropdown-menu {
        > .dropdown-header {
          border-color: @navbar-inverse-border;
        }
+        .divider {
+          background-color: @navbar-inverse-border;
+        }
        > li > a {
          color: @navbar-inverse-link-color;
          &:hover,
--- a/assets/less/bootstrap/navs.less
+++ b/assets/less/bootstrap/navs.less
@@ -48,11 +48,6 @@
    &:focus {
      background-color: @nav-link-hover-bg;
      border-color: @link-color;
-
-      .caret {
-        border-top-color: @link-hover-color;
-        border-bottom-color: @link-hover-color;
-      }
    }
  }

@@ -138,11 +133,6 @@
      &:focus {
        color: @nav-pills-active-link-hover-color;
        background-color: @nav-pills-active-link-hover-bg;
-
-        .caret {
-          border-top-color: @nav-pills-active-link-hover-color;
-          border-bottom-color: @nav-pills-active-link-hover-color;
-        }
      }
    }
  }
@@ -243,16 +233,6 @@
 // Dropdowns
 // -------------------------

-// Make dropdown carets use link color in navs
-.nav .caret {
-  border-top-color: @link-color;
-  border-bottom-color: @link-color;
-}
-.nav a:hover .caret {
-  border-top-color: @link-hover-color;
-  border-bottom-color: @link-hover-color;
-}
-
 // Specific dropdowns
 .nav-tabs .dropdown-menu {
  // make dropdown border overlap tab border
--- a/assets/less/bootstrap/normalize.less
+++ b/assets/less/bootstrap/normalize.less
--- a/assets/less/bootstrap/pager.less
+++ b/assets/less/bootstrap/pager.less
--- a/assets/less/bootstrap/pagination.less
+++ b/assets/less/bootstrap/pagination.less
--- a/assets/less/bootstrap/panels.less
+++ b/assets/less/bootstrap/panels.less
@@ -57,13 +57,17 @@

 .panel {
  > .table,
-  > .table-responsive {
+  > .table-responsive > .table {
    margin-bottom: 0;
  }
  > .panel-body + .table,
  > .panel-body + .table-responsive {
    border-top: 1px solid @table-border-color;
  }
+  > .table > tbody:first-child th,
+  > .table > tbody:first-child td {
+    border-top: 0;
+  }
  > .table-bordered,
  > .table-responsive > .table-bordered {
    border: 0;
@@ -87,6 +91,10 @@
      }
    }
  }
+  > .table-responsive {
+    border: 0;
+    margin-bottom: 0;
+  }
 }


@@ -106,6 +114,8 @@
  margin-top: 0;
  margin-bottom: 0;
  font-size: ceil((@font-size-base * 1.125));
+  color: inherit;
+
  > a {
    color: inherit;
  }
--- a/assets/less/bootstrap/popovers.less
+++ b/assets/less/bootstrap/popovers.less
--- a/assets/less/bootstrap/print.less
+++ b/assets/less/bootstrap/print.less
--- a/assets/less/bootstrap/progress-bars.less
+++ b/assets/less/bootstrap/progress-bars.less
@@ -12,18 +12,6 @@
  to    { background-position: 0 0; }
 }

-// Firefox
-@-moz-keyframes progress-bar-stripes {
-  from  { background-position: 40px 0; }
-  to    { background-position: 0 0; }
-}
-
-// Opera
-@-o-keyframes progress-bar-stripes {
-  from  { background-position: 0 0; }
-  to    { background-position: 40px 0; }
-}
-
 // Spec and IE10+
@keyframes progress-bar-stripes {
  from  { background-position: 40px 0; }
--- a/assets/less/bootstrap/responsive-utilities.less
+++ b/assets/less/bootstrap/responsive-utilities.less
--- a/assets/less/bootstrap/scaffolding.less
+++ b/assets/less/bootstrap/scaffolding.less
--- a/assets/less/bootstrap/tables.less
+++ b/assets/less/bootstrap/tables.less
@@ -104,10 +104,12 @@ th {
 //
 // Default zebra-stripe styles (alternating gray and transparent backgrounds)

-.table-striped > tbody > tr:nth-child(odd) {
-  > td,
-  > th {
-    background-color: @table-bg-accent;
+.table-striped {
+  > tbody > tr:nth-child(odd) {
+    > td,
+    > th {
+      background-color: @table-bg-accent;
+    }
  }
 }

@@ -116,10 +118,12 @@ th {
 //
 // Placed here since it has to come after the potential zebra striping

-.table-hover > tbody > tr:hover {
-  > td,
-  > th {
-    background-color: @table-bg-hover;
+.table-hover {
+  > tbody > tr:hover {
+    > td,
+    > th {
+      background-color: @table-bg-hover;
+    }
  }
 }

@@ -129,6 +133,7 @@ th {
 // Reset default table behavior

 table col[class*="col-"] {
+  position: static; // Prevent border hiding in Firefox and IE9/10 (see https://github.com/twbs/bootstrap/issues/11623)
  float: none;
  display: table-column;
 }
@@ -148,21 +153,11 @@ table {
 // Exact selectors below required to override `.table-striped` and prevent
 // inheritance to nested tables.

-.table > thead > tr,
-.table > tbody > tr,
-.table > tfoot > tr {
-  > td.active,
-  > th.active,
-  &.active > td,
-  &.active > th  {
-    background-color: @table-bg-active;
-  }
-}
-
 // Generate the contextual variants
-.table-row-variant(success; @state-success-bg; @state-success-border);
-.table-row-variant(danger; @state-danger-bg; @state-danger-border);
-.table-row-variant(warning; @state-warning-bg; @state-warning-border);
+.table-row-variant(active; @table-bg-active);
+.table-row-variant(success; @state-success-bg);
+.table-row-variant(danger; @state-danger-bg);
+.table-row-variant(warning; @state-warning-bg);


 // Responsive tables
--- a/assets/less/bootstrap/theme.less
+++ b/assets/less/bootstrap/theme.less
--- a/assets/less/bootstrap/thumbnails.less
+++ b/assets/less/bootstrap/thumbnails.less
@@ -5,11 +5,17 @@

 // Mixin and adjust the regular image class
 .thumbnail {
-  .img-thumbnail();
-  display: block; // Override the inline-block from `.img-thumbnail`
+  display: block;
+  padding: @thumbnail-padding;
  margin-bottom: @line-height-computed;
+  line-height: @line-height-base;
+  background-color: @thumbnail-bg;
+  border: 1px solid @thumbnail-border;
+  border-radius: @thumbnail-border-radius;
+  .transition(all .2s ease-in-out);

-  > img {
+  > img,
+  a > img {
    .img-responsive();
    margin-left: auto;
    margin-right: auto;
--- a/assets/less/bootstrap/tooltip.less
+++ b/assets/less/bootstrap/tooltip.less
--- a/assets/less/bootstrap/type.less
+++ b/assets/less/bootstrap/type.less
@@ -3,12 +3,62 @@
 // --------------------------------------------------


+// Headings
+// -------------------------
+
+h1, h2, h3, h4, h5, h6,
+.h1, .h2, .h3, .h4, .h5, .h6 {
+  font-family: @headings-font-family;
+  font-weight: @headings-font-weight;
+  line-height: @headings-line-height;
+  color: @headings-color;
+
+  small,
+  .small {
+    font-weight: normal;
+    line-height: 1;
+    color: @headings-small-color;
+  }
+}
+
+h1,
+h2,
+h3 {
+  margin-top: @line-height-computed;
+  margin-bottom: (@line-height-computed / 2);
+
+  small,
+  .small {
+    font-size: 65%;
+  }
+}
+h4,
+h5,
+h6 {
+  margin-top: (@line-height-computed / 2);
+  margin-bottom: (@line-height-computed / 2);
+
+  small,
+  .small {
+    font-size: 75%;
+  }
+}
+
+h1, .h1 { font-size: @font-size-h1; }
+h2, .h2 { font-size: @font-size-h2; }
+h3, .h3 { font-size: @font-size-h3; }
+h4, .h4 { font-size: @font-size-h4; }
+h5, .h5 { font-size: @font-size-h5; }
+h6, .h6 { font-size: @font-size-h6; }
+
+
 // Body text
 // -------------------------

 p {
  margin: 0 0 (@line-height-computed / 2);
 }
+
 .lead {
  margin-bottom: @line-height-computed;
  font-size: floor(@font-size-base * 1.15);
@@ -72,55 +122,6 @@ cite    { font-style: normal; }
 .text-center         { text-align: center; }


-// Headings
-// -------------------------
-
-h1, h2, h3, h4, h5, h6,
-.h1, .h2, .h3, .h4, .h5, .h6 {
-  font-family: @headings-font-family;
-  font-weight: @headings-font-weight;
-  line-height: @headings-line-height;
-  color: @headings-color;
-
-  small,
-  .small {
-    font-weight: normal;
-    line-height: 1;
-    color: @headings-small-color;
-  }
-}
-
-h1,
-h2,
-h3 {
-  margin-top: @line-height-computed;
-  margin-bottom: (@line-height-computed / 2);
-
-  small,
-  .small {
-    font-size: 65%;
-  }
-}
-h4,
-h5,
-h6 {
-  margin-top: (@line-height-computed / 2);
-  margin-bottom: (@line-height-computed / 2);
-
-  small,
-  .small {
-    font-size: 75%;
-  }
-}
-
-h1, .h1 { font-size: @font-size-h1; }
-h2, .h2 { font-size: @font-size-h2; }
-h3, .h3 { font-size: @font-size-h3; }
-h4, .h4 { font-size: @font-size-h4; }
-h5, .h5 { font-size: @font-size-h5; }
-h6, .h6 { font-size: @font-size-h6; }
-
-
 // Page header
 // -------------------------

@@ -131,7 +132,6 @@ h6, .h6 { font-size: @font-size-h6; }
 }


-
 // Lists
 // --------------------------------------------------

@@ -171,6 +171,7 @@ ol {

 // Description Lists
 dl {
+  margin-top: 0; // Remove browser default
  margin-bottom: @line-height-computed;
 }
 dt,
@@ -215,7 +216,7 @@ abbr[data-original-title] {
  cursor: help;
  border-bottom: 1px dotted @abbr-border-color;
 }
-abbr.initialism {
+.initialism {
  font-size: 90%;
  text-transform: uppercase;
 }
@@ -233,7 +234,8 @@ blockquote {
  p:last-child {
    margin-bottom: 0;
  }
-  small {
+  small,
+  .small {
    display: block;
    line-height: @line-height-base;
    color: @blockquote-small-color;
--- a/assets/less/bootstrap/utilities.less
+++ b/assets/less/bootstrap/utilities.less
--- a/assets/less/bootstrap/variables.less
+++ b/assets/less/bootstrap/variables.less
@@ -41,7 +41,7 @@

@font-family-sans-serif:  "Helvetica Neue", Helvetica, Arial, sans-serif;
@font-family-serif:       Georgia, "Times New Roman", Times, serif;
-@font-family-monospace:   Monaco, Menlo, Consolas, "Courier New", monospace;
+@font-family-monospace:   Menlo, Monaco, Consolas, "Courier New", monospace;
@font-family-base:        @font-family-sans-serif;

@font-size-base:          14px;
@@ -84,6 +84,9 @@
@padding-small-vertical:         5px;
@padding-small-horizontal:       10px;

+@padding-xs-vertical:            1px;
+@padding-xs-horizontal:          5px;
+
@line-height-large:              1.33;
@line-height-small:              1.5;

@@ -157,7 +160,7 @@
@input-color-placeholder:        @gray-light;

@input-height-base:              (@line-height-computed + (@padding-base-vertical * 2) + 2);
-@input-height-large:             (floor(@font-size-large * @line-height-large) + (@padding-large-vertical * 2) + 2);
+@input-height-large:             (ceil(@font-size-large * @line-height-large) + (@padding-large-vertical * 2) + 2);
@input-height-small:             (floor(@font-size-small * @line-height-small) + (@padding-small-vertical * 2) + 2);

@legend-color:                   @gray-dark;
@@ -186,8 +189,6 @@

@dropdown-header-color:          @gray-light;

-@dropdown-caret-color:           #000;
-

 // COMPONENT VARIABLES
 // --------------------------------------------------
@@ -246,8 +247,13 @@
@grid-columns:              12;
 // Padding, to be divided by two and applied to the left and right of all columns
@grid-gutter-width:         30px;
-// Point at which the navbar stops collapsing
+
+// Navbar collapse
+
+// Point at which the navbar becomes uncollapsed
@grid-float-breakpoint:     @screen-sm-min;
+// Point at which the navbar begins collapsing
+@grid-float-breakpoint-max: (@grid-float-breakpoint - 1);


 // Navbar
@@ -321,7 +327,6 @@
@nav-disabled-link-hover-color:             @gray-light;

@nav-open-link-hover-color:                 #fff;
-@nav-open-caret-border-color:               #fff;

 // Tabs
@nav-tabs-border-color:                     #ddd;
@@ -375,19 +380,19 @@
 // Form states and alerts
 // -------------------------

-@state-success-text:             #468847;
+@state-success-text:             #3c763d;
@state-success-bg:               #dff0d8;
@state-success-border:           darken(spin(@state-success-bg, -10), 5%);

-@state-info-text:                #3a87ad;
+@state-info-text:                #31708f;
@state-info-bg:                  #d9edf7;
@state-info-border:              darken(spin(@state-info-bg, -10), 7%);

-@state-warning-text:             #c09853;
+@state-warning-text:             #8a6d3b;
@state-warning-bg:               #fcf8e3;
@state-warning-border:           darken(spin(@state-warning-bg, -10), 5%);

-@state-danger-text:              #b94a48;
+@state-danger-text:              #a94442;
@state-danger-bg:                #f2dede;
@state-danger-border:            darken(spin(@state-danger-bg, -10), 5%);

--- a/assets/less/bootstrap/wells.less
+++ b/assets/less/bootstrap/wells.less
--- a/lib/scripts.php
+++ b/lib/scripts.php
@@ -11,7 +11,7 @@
 * 3. /theme/assets/js/main.min.js (in footer)
 */
 function roots_scripts() {
-  wp_enqueue_style('roots_main', get_template_directory_uri() . '/assets/css/main.min.css', false, '9dbd7d094ab56a14e3b2a984b20ea357');
+  wp_enqueue_style('roots_main', get_template_directory_uri() . '/assets/css/main.min.css', false, '6c39f42987ae297a5a21e2bb35bf3402');

  // jQuery is loaded using the same method from HTML5 Boilerplate:
  // Grab Google CDN's latest jQuery with a protocol relative URL; fallback to local if offline
@@ -27,7 +27,7 @@ function roots_scripts() {
  }

  wp_register_script('modernizr', get_template_directory_uri() . '/assets/js/vendor/modernizr-2.7.0.min.js', false, null, false);
-  wp_register_script('roots_scripts', get_template_directory_uri() . '/assets/js/scripts.min.js', false, 'be373268f9b8ecda7c3a45154676e637', true);
+  wp_register_script('roots_scripts', get_template_directory_uri() . '/assets/js/scripts.min.js', false, '01d073428e4e54f227f8a0a3bad4b804', true);
  wp_enqueue_script('modernizr');
  wp_enqueue_script('jquery');
  wp_enqueue_script('roots_scripts');