Merge branch 'master' into derp

Conflicts:
	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/customizer-variables.html
	docs/assets/js/customize.min.js
	docs/assets/js/raw-files.min.js
	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
	less/_variables.less

.travis.yml

@@ -20,7 +20,7 @@ after_script:
   - if [ "$TWBS_TEST" = validate-html ] && [ $TWBS_DO_VALIDATOR -ne 0 ]; then ./test-infra/s3_cache.py upload rubygems; fi
 env:
   global:
-    - JEKYLL_VERSION: 2.4.0
+    - JEKYLL_VERSION: 2.5.1
     - ROUGE_VERSION: 1.7.2
     - SAUCE_USERNAME: bootstrap
     - secure: "pJkBwnuae9dKU5tEcCqccfS1QQw7/meEcfz63fM7ba7QJNjoA6BaXj08L5Z3Vb5vBmVPwBawxo5Hp0jC0r/Z/O0hGnAmz/Cz09L+cy7dSAZ9x4hvZePSja/UAusaB5ogMoO8l2b773MzgQeSmrLbExr9BWLeqEfjC2hFgdgHLaQ="

README.md

@@ -67,7 +67,7 @@ Bootstrap's documentation, included in this repo in the root directory, is built
 
 ### Running documentation locally
 
-1. If necessary, [install Jekyll](http://jekyllrb.com/docs/installation) (requires v2.4.x).
+1. If necessary, [install Jekyll](http://jekyllrb.com/docs/installation) (requires v2.5.x).
   - **Windows users:** Read [this unofficial guide](http://jekyll-windows.juthilo.com/) to get Jekyll up and running without problems.
 2. Install the Ruby-based syntax highlighter, [Rouge](https://github.com/jneen/rouge), with `gem install rouge`.
 3. From the root `/bootstrap` directory, run `jekyll serve` in the command line.

dist/css/bootstrap.css

@@ -2129,7 +2129,7 @@ fieldset[disabled] .btn {
 .btn-primary.active,
 .open > .dropdown-toggle.btn-primary {
   color: #fff;
-  background-color: #0159a5;
+  background-color: #025aa5;
   border-color: #014682;
 }
 .btn-primary:active,
@@ -3991,7 +3991,7 @@ a.label:focus {
 }
 .label-primary[href]:hover,
 .label-primary[href]:focus {
-  background-color: #0159a5;
+  background-color: #025aa5;
 }
 .label-success {
   background-color: #5cb85c;
@@ -4434,7 +4434,7 @@ a.list-group-item:focus {
 .list-group-item.active .list-group-item-text,
 .list-group-item.active:hover .list-group-item-text,
 .list-group-item.active:focus .list-group-item-text {
-  color: #a7d6fe;
+  color: #a8d6fe;
 }
 .list-group-item-success {
   color: #3c763d;
@@ -5259,7 +5259,7 @@ button.close {
   color: #0275d8;
 }
 a.text-primary:hover {
-  color: #0159a5;
+  color: #025aa5;
 }
 .text-success {
   color: #3c763d;
@@ -5290,7 +5290,7 @@ a.text-danger:hover {
   background-color: #0275d8;
 }
 a.bg-primary:hover {
-  background-color: #0159a5;
+  background-color: #025aa5;
 }
 .bg-success {
   background-color: #dff0d8;

docs/_includes/customizer-variables.html

@@ -31,7 +31,7 @@
   <div class="clearfix"></div>
   <div class="col-xs-4">
     <label for="input-@brand-primary">@brand-primary</label>
-    <input id="input-@brand-primary" type="text" value="darken(#027de7, 3%)" data-var="@brand-primary" class="form-control"/>
+    <input id="input-@brand-primary" type="text" value="#0275d8" data-var="@brand-primary" class="form-control"/>
   </div>
   <div class="col-xs-4">
     <label for="input-@brand-success">@brand-success</label>

docs/assets/css/src/docs.css

@@ -437,7 +437,7 @@ body {
   color: #333;
 }
 .bs-docs-featurette-img:hover {
-  color: #428bca;
+  color: #337ab7;
   text-decoration: none;
 }
 .bs-docs-featurette-img img {
@@ -771,7 +771,7 @@ h1[id] {
   background-color: #eee;
 }
 .color-swatches .brand-primary {
-  background-color: #428bca;
+  background-color: #337ab7;
 }
 .color-swatches .brand-success {
   background-color: #5cb85c;

docs/dist/css/bootstrap.css

@@ -2129,7 +2129,7 @@ fieldset[disabled] .btn {
 .btn-primary.active,
 .open > .dropdown-toggle.btn-primary {
   color: #fff;
-  background-color: #0159a5;
+  background-color: #025aa5;
   border-color: #014682;
 }
 .btn-primary:active,
@@ -3991,7 +3991,7 @@ a.label:focus {
 }
 .label-primary[href]:hover,
 .label-primary[href]:focus {
-  background-color: #0159a5;
+  background-color: #025aa5;
 }
 .label-success {
   background-color: #5cb85c;
@@ -4434,7 +4434,7 @@ a.list-group-item:focus {
 .list-group-item.active .list-group-item-text,
 .list-group-item.active:hover .list-group-item-text,
 .list-group-item.active:focus .list-group-item-text {
-  color: #a7d6fe;
+  color: #a8d6fe;
 }
 .list-group-item-success {
   color: #3c763d;
@@ -5259,7 +5259,7 @@ button.close {
   color: #0275d8;
 }
 a.text-primary:hover {
-  color: #0159a5;
+  color: #025aa5;
 }
 .text-success {
   color: #3c763d;
@@ -5290,7 +5290,7 @@ a.text-danger:hover {
   background-color: #0275d8;
 }
 a.bg-primary:hover {
-  background-color: #0159a5;
+  background-color: #025aa5;
 }
 .bg-success {
   background-color: #dff0d8;