aboutsummaryrefslogtreecommitdiff
path: root/less/modals.less
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-11-30 00:55:00 -0800
committerMark Otto <[email protected]>2013-11-30 00:55:00 -0800
commit080aa7f5c8557b232005cb947df51968d4629656 (patch)
treee546cc3ec229d201751e426da36a1b2a586ee428 /less/modals.less
parent441f9d67179f766377eed4b0cedc5dc6eec290e4 (diff)
parent819e920d1646f7e9fec8d3dd6ba10dcbd2fa1599 (diff)
downloadbootstrap-080aa7f5c8557b232005cb947df51968d4629656.tar.xz
bootstrap-080aa7f5c8557b232005cb947df51968d4629656.zip
Merge branch 'master' into pr/11299
Conflicts: dist/css/bootstrap.min.css docs-assets/js/raw-files.js
Diffstat (limited to 'less/modals.less')
-rw-r--r--less/modals.less6
1 files changed, 3 insertions, 3 deletions
diff --git a/less/modals.less b/less/modals.less
index 99cf76469..c9feb7f18 100644
--- a/less/modals.less
+++ b/less/modals.less
@@ -38,7 +38,7 @@
margin-left: auto;
margin-right: auto;
width: auto;
- padding: 10px;
+ margin: 10px;
z-index: (@zindex-modal-background + 10);
}
@@ -122,8 +122,8 @@
.modal-dialog {
width: 600px;
- padding-top: 30px;
- padding-bottom: 30px;
+ margin-top: 30px;
+ margin-bottom: 30px;
}
.modal-content {
.box-shadow(0 5px 15px rgba(0,0,0,.5));