diff options
| author | Mark Otto <[email protected]> | 2014-06-08 13:57:44 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-06-08 13:57:44 -0700 |
| commit | d1872b4c98f26b1bfcd7e007133b97e6602dd0d0 (patch) | |
| tree | ccc12bda1d6df512fbc9c4023b296f46a6f05e3f /dist/css/bootstrap.css | |
| parent | 5872a7e0aca5e2b5b8e0be5df8b2a7cdf987d805 (diff) | |
| parent | 5cd72ce23058b47a739c7e2005ab5c3d4e28ff30 (diff) | |
| download | bootstrap-d1872b4c98f26b1bfcd7e007133b97e6602dd0d0.tar.xz bootstrap-d1872b4c98f26b1bfcd7e007133b97e6602dd0d0.zip | |
Merge branch 'master' into pr/13736
Conflicts:
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
Diffstat (limited to 'dist/css/bootstrap.css')
| -rw-r--r-- | dist/css/bootstrap.css | 42 |
1 files changed, 26 insertions, 16 deletions
diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 138bd4304..8f378a5aa 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -2440,18 +2440,24 @@ input[type="month"].input-lg { } input[type="radio"][disabled], input[type="checkbox"][disabled], -.radio[disabled], -.radio-inline[disabled], -.checkbox[disabled], -.checkbox-inline[disabled], +input[type="radio"].disabled, +input[type="checkbox"].disabled, fieldset[disabled] input[type="radio"], -fieldset[disabled] input[type="checkbox"], -fieldset[disabled] .radio, +fieldset[disabled] input[type="checkbox"] { + cursor: not-allowed; +} +.radio-inline.disabled, +.checkbox-inline.disabled, fieldset[disabled] .radio-inline, -fieldset[disabled] .checkbox, fieldset[disabled] .checkbox-inline { cursor: not-allowed; } +.radio.disabled label, +.checkbox.disabled label, +fieldset[disabled] .radio label, +fieldset[disabled] .checkbox label { + cursor: not-allowed; +} .input-sm { height: 30px; padding: 5px 10px; @@ -3816,6 +3822,9 @@ select[multiple].input-group-sm > .input-group-btn > .btn { right: 0; left: 0; z-index: 1030; + -webkit-transform: translate3d(0, 0, 0); + -o-transform: translate3d(0, 0, 0); + transform: translate3d(0, 0, 0); } @media (min-width: 768px) { .navbar-fixed-top, @@ -5127,7 +5136,7 @@ a.list-group-item-danger.active:focus { .panel-group .panel-heading { border-bottom: 0; } -.panel-group .panel-heading + .panel-collapse .panel-body { +.panel-group .panel-heading + .panel-collapse > .panel-body { border-top: 1px solid #ddd; } .panel-group .panel-footer { @@ -5312,16 +5321,14 @@ button.close { -webkit-transition: -webkit-transform .3s ease-out; -o-transition: -o-transform .3s ease-out; transition: transform .3s ease-out; - -webkit-transform: translate(0, -25%); - -ms-transform: translate(0, -25%); - -o-transform: translate(0, -25%); - transform: translate(0, -25%); + -webkit-transform: translate3d(0, -25%, 0); + -o-transform: translate3d(0, -25%, 0); + transform: translate3d(0, -25%, 0); } .modal.in .modal-dialog { - -webkit-transform: translate(0, 0); - -ms-transform: translate(0, 0); - -o-transform: translate(0, 0); - transform: translate(0, 0); + -webkit-transform: translate3d(0, 0, 0); + -o-transform: translate3d(0, 0, 0); + transform: translate3d(0, 0, 0); } .modal-dialog { position: relative; @@ -5907,6 +5914,9 @@ button.close { } .affix { position: fixed; + -webkit-transform: translate3d(0, 0, 0); + -o-transform: translate3d(0, 0, 0); + transform: translate3d(0, 0, 0); } @-ms-viewport { width: device-width; |
