diff options
| author | Mark Otto <[email protected]> | 2013-12-11 22:39:03 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-12-11 22:39:03 -0800 |
| commit | 4fc2907723e7f7bb5b14eb5cec94d629b6834e7f (patch) | |
| tree | a9c1df41fbf5f912234f762f03668ea4ef9fd2b7 /less/modals.less | |
| parent | 0e8baab34ae21c813afb9d8c24b3cb2105aebc46 (diff) | |
| parent | 9966d035cd35c510369286cbb645340bdd6ffc95 (diff) | |
| download | bootstrap-4fc2907723e7f7bb5b14eb5cec94d629b6834e7f.tar.xz bootstrap-4fc2907723e7f7bb5b14eb5cec94d629b6834e7f.zip | |
Merge branch 'master' into docs_derp
Conflicts:
docs-assets/css/docs.css
docs-assets/js/application.js
Diffstat (limited to 'less/modals.less')
| -rw-r--r-- | less/modals.less | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/less/modals.less b/less/modals.less index 99cf76469..292b5bd9c 100644 --- a/less/modals.less +++ b/less/modals.less @@ -35,10 +35,8 @@ // Shell div to position the modal with bottom padding .modal-dialog { position: relative; - margin-left: auto; - margin-right: auto; width: auto; - padding: 10px; + margin: 10px; z-index: (@zindex-modal-background + 10); } @@ -100,7 +98,7 @@ padding: (@modal-inner-padding - 1) @modal-inner-padding @modal-inner-padding; text-align: right; // right align buttons border-top: 1px solid @modal-footer-border-color; - .clearfix(); // clear it in case folks use .pull-* classes on buttons + &:extend(.clearfix all); // clear it in case folks use .pull-* classes on buttons // Properly space out buttons .btn + .btn { @@ -122,8 +120,7 @@ .modal-dialog { width: 600px; - padding-top: 30px; - padding-bottom: 30px; + margin: 30px auto; } .modal-content { .box-shadow(0 5px 15px rgba(0,0,0,.5)); |