mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-26 14:54:27 +02:00
Code Issues Releases Wiki Activity

Merge branch 'master' into v4m

Browse Source
This commit is contained in:
Mark Otto
2015-08-04 22:29:45 -07:00
parent 8ee9da2f54 ab412b2404
commit 1ddc3f5e21
42 changed files with 1101 additions and 1005 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scss/_modal.scss
View File

@@ -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 {

5
scss/mixins/_buttons.scss
View File

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