diff options
| author | Mark Otto <[email protected]> | 2015-08-04 22:29:45 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2015-08-04 22:29:45 -0700 |
| commit | 1ddc3f5e21d8a7df6fdec100c48c82aaf8751a83 (patch) | |
| tree | 9a9380632e1a113b1fe0f8aa72be25bfb0fd7fad /scss | |
| parent | 8ee9da2f54bcf7da2fc599a93e2d53a78be3ce9f (diff) | |
| parent | ab412b2404d12a3c55d1c4b798bd42ef32e80fab (diff) | |
| download | bootstrap-1ddc3f5e21d8a7df6fdec100c48c82aaf8751a83.tar.xz bootstrap-1ddc3f5e21d8a7df6fdec100c48c82aaf8751a83.zip | |
Merge branch 'master' into v4m
Diffstat (limited to 'scss')
| -rw-r--r-- | scss/_modal.scss | 2 | ||||
| -rw-r--r-- | scss/mixins/_buttons.scss | 5 |
2 files changed, 2 insertions, 5 deletions
diff --git a/scss/_modal.scss b/scss/_modal.scss index 5dd79f76a..ce3b3e80c 100644 --- a/scss/_modal.scss +++ b/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 { diff --git a/scss/mixins/_buttons.scss b/scss/mixins/_buttons.scss index f18b9c253..7861ab801 100644 --- a/scss/mixins/_buttons.scss +++ b/scss/mixins/_buttons.scss @@ -37,11 +37,8 @@ &.disabled, &:disabled, fieldset[disabled] & { - &, &:focus, - &.focus, - &:active, - &.active { + &.focus { background-color: $background; border-color: $border; } |