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

1 files changed, 5 insertions, 5 deletions

diff --git a/docs/dist/css/bootstrap.css b/docs/dist/css/bootstrap.css
index 2d3ab9eb6..9430d7038 100644
--- a/docs/dist/css/bootstrap.css
+++ b/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;