Merge branch 'master' into v4m

scss/_modal.scss

@@ -77,9 +77,9 @@
 // Modal header
 // Top section of the modal w/ title and dismiss
 .modal-header {
-  min-height: ($modal-title-padding + $modal-title-line-height);
   padding: $modal-title-padding;
   border-bottom: 1px solid $modal-header-border-color;
+  @include clearfix;
 }
 // Close icon
 .modal-header .close {

scss/mixins/_buttons.scss

@@ -37,11 +37,8 @@
   &.disabled,
   &:disabled,
   fieldset[disabled] & {
-    &,
     &:focus,
-    &.focus,
-    &:active,
-    &.active {
+    &.focus {
       background-color: $background;
           border-color: $border;
     }