diff options
author | Mark Otto <otto@github.com> | 2012-10-30 09:01:58 +0400 |
---|---|---|
committer | Mark Otto <otto@github.com> | 2012-10-30 09:01:58 +0400 |
commit | b5af762ef59e1fa97f4386f5feadb67aa5183fef (patch) | |
tree | 3bcd0841e6938379e8c8ae7259ee16f27a49ea41 /less/modals.less | |
parent | 7426ced0fb288a9e86f18da1849ad74f652d219a (diff) | |
parent | 68cfedb34af198f178128f8c9bc8ea164e44304a (diff) |
Merge branch '2.1.2-wip'v2.2.0
Conflicts:
js/bootstrap-dropdown.js
Diffstat (limited to 'less/modals.less')
-rw-r--r-- | less/modals.less | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/less/modals.less b/less/modals.less index 81cacb7ab1..90b86670f4 100644 --- a/less/modals.less +++ b/less/modals.less @@ -2,16 +2,6 @@ // Modals // -------------------------------------------------- - -// Recalculate z-index where appropriate, -// but only apply to elements within modal -.modal-open .modal { - .dropdown-menu { z-index: @zindexDropdown + @zindexModal; } - .dropdown.open { *z-index: @zindexDropdown + @zindexModal; } - .popover { z-index: @zindexPopover + @zindexModal; } - .tooltip { z-index: @zindexTooltip + @zindexModal; } -} - // Background .modal-backdrop { position: fixed; @@ -36,7 +26,6 @@ top: 50%; left: 50%; z-index: @zindexModal; - overflow: auto; width: 560px; margin: -250px 0 0 -280px; background-color: @white; @@ -46,6 +35,9 @@ .border-radius(6px); .box-shadow(0 3px 7px rgba(0,0,0,0.3)); .background-clip(padding-box); + // Remove focus outline from opened modal + outline: none; + &.fade { .transition(e('opacity .3s linear, top .3s ease-out')); top: -25%; @@ -95,4 +87,8 @@ .btn-group .btn + .btn { margin-left: -1px; } + // and override it for block buttons as well + .btn-block + .btn-block { + margin-left: 0; + } } |