diff options
| author | Ivan Khalopik <[email protected]> | 2013-05-07 15:16:45 +0300 |
|---|---|---|
| committer | Ivan Khalopik <[email protected]> | 2013-05-07 15:16:45 +0300 |
| commit | 3c7a43a1f373d0c534476578b96a75ae2e63c985 (patch) | |
| tree | f11fa18c33d1a65ae4422dc3c352c34a2b323b8c /less/modals.less | |
| parent | 41c782567775d3bbcfc62d163ae22a531277b5e2 (diff) | |
| parent | b352f98f325adbd994f01cb94f4d0a454783bbce (diff) | |
| download | bootstrap-3c7a43a1f373d0c534476578b96a75ae2e63c985.tar.xz bootstrap-3c7a43a1f373d0c534476578b96a75ae2e63c985.zip | |
Merge remote-tracking branch 'bootstrap/3.0.0-wip' into 3.0.0-wip
Conflicts:
js/tests/unit/bootstrap-collapse.js
Diffstat (limited to 'less/modals.less')
| -rw-r--r-- | less/modals.less | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/less/modals.less b/less/modals.less index 9d9baccea..144588a7b 100644 --- a/less/modals.less +++ b/less/modals.less @@ -74,18 +74,19 @@ // Modal header // Top section of the modal w/ title and dismiss .modal-header { - padding: 9px 15px; + padding: @modal-title-padding; border-bottom: 1px solid #e5e5e5; + min-height: (@modal-title-padding + @modal-title-line-height); } // Close icon .modal-header .close { - margin-top: 2px; + margin-top: -2px; } // Title text within header .modal-title { margin: 0; - line-height: 30px; // effectively set a min-height for the header + line-height: @modal-title-line-height; } // Modal body @@ -119,7 +120,7 @@ } // Scale up the modal -@media screen and (min-width: 768px) { +@media screen and (min-width: @screen-tablet) { .modal-dialog { left: 50%; |