diff options
| author | Mark Otto <[email protected]> | 2014-01-18 14:11:55 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-01-18 14:11:55 -0800 |
| commit | cd1bea0616a8fb1b94d8021bc8dbc0cbc2eaf4aa (patch) | |
| tree | 0c0a716f3f567c7bd17fb9f6fb254100d78d0e18 /dist/css/bootstrap.css | |
| parent | b121207e10ad20e6d1d8dc269f71697ad26a67e6 (diff) | |
| parent | b1721f42cc8298fb691530614ee6d52389872e25 (diff) | |
| download | bootstrap-cd1bea0616a8fb1b94d8021bc8dbc0cbc2eaf4aa.tar.xz bootstrap-cd1bea0616a8fb1b94d8021bc8dbc0cbc2eaf4aa.zip | |
Merge branch 'master' into bg-variant
Diffstat (limited to 'dist/css/bootstrap.css')
| -rw-r--r-- | dist/css/bootstrap.css | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 4cad26c16..26257d194 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -251,7 +251,11 @@ table { border: 1px solid #ddd !important; } } -*, +* { + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; +} *:before, *:after { -webkit-box-sizing: border-box; @@ -5060,9 +5064,9 @@ button.close { -moz-transition: -moz-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%); - transform: translate(0, -25%); + -webkit-transform: translate(0, -25%); + -ms-transform: translate(0, -25%); + transform: translate(0, -25%); } .modal.in .modal-dialog { -webkit-transform: translate(0, 0); |