Merge branch 'v4-dev' into v4-forms-cleanup

scss/mixins/_buttons.scss

@@ -64,19 +64,33 @@
   background-color: transparent;
   border-color: $color;
 
+  @include hover {
+    color: #fff;
+    background-color: $color;
+        border-color: $color;
+  }
+
   &:focus,
-  &.focus,
+  &.focus {
+    color: #fff;
+    background-color: $color;
+        border-color: $color;
+  }
+
   &:active,
   &.active,
   .open > &.dropdown-toggle {
     color: #fff;
     background-color: $color;
         border-color: $color;
-  }
-  @include hover {
-    color: #fff;
-    background-color: $color;
-        border-color: $color;
+
+    &:hover,
+    &:focus,
+    &.focus {
+      color: #fff;
+      background-color: darken($color, 17%);
+          border-color: darken($color, 25%);
+    }
   }
 
   &.disabled,

scss/mixins/_forms.scss

@@ -14,7 +14,8 @@
   &.radio label,
   &.checkbox label,
   &.radio-inline label,
-  &.checkbox-inline label  {
+  &.checkbox-inline label,
+  .custom-control {
     color: $color;
   }
   // Set the border and box shadow on specific inputs to match

scss/mixins/_grid-framework.scss

@@ -15,14 +15,14 @@
           flex-grow: 1;
           max-width: 100%;
           min-height: 1px;
-          padding-right: ($grid-gutter-width / 2);
-          padding-left:  ($grid-gutter-width / 2);
+          padding-right: ($gutter / 2);
+          padding-left:  ($gutter / 2);
         }
       }
 
       @for $i from 1 through $columns {
         .col-#{$breakpoint}-#{$i} {
-          @include make-col($i, $columns);
+          @include make-col($i, $columns, $gutter);
         }
       }
 
@@ -36,7 +36,7 @@
 
       // `$columns - 1` because offsetting by the width of an entire row isn't possible
       @for $i from 0 through ($columns - 1) {
-        @if $breakpoint-counter != 1 or $i != 0 { // Avoid emitting useless .col-xs-offset-0
+        @if $breakpoint-counter != 1 or $i != 0 { // Avoid emitting useless .offset-xs-0
           .offset-#{$breakpoint}-#{$i} {
             @include make-col-modifier(offset, $i, $columns)
           }

scss/mixins/_grid.scss

@@ -33,11 +33,11 @@
   margin-right: ($gutter / -2);
 }
 
-@mixin make-col($size, $columns: $grid-columns) {
+@mixin make-col($size, $columns: $grid-columns, $gutter: $grid-gutter-width) {
   position: relative;
   min-height: 1px;
-  padding-right: ($grid-gutter-width / 2);
-  padding-left:  ($grid-gutter-width / 2);
+  padding-right: ($gutter / 2);
+  padding-left:  ($gutter / 2);
 
   @if $enable-flex {
     flex: 0 0 percentage($size / $columns);

scss/mixins/_tag.scss

@@ -1,6 +1,6 @@
-// Labels
+// Tags
 
-@mixin label-variant($color) {
+@mixin tag-variant($color) {
   background-color: $color;
 
   &[href] {