diff options
| author | Mark Otto <[email protected]> | 2014-01-18 14:11:36 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-01-18 14:11:36 -0800 |
| commit | 689e75e4b1b8055e657b30eb692b34ebf9d549da (patch) | |
| tree | 711f3f78d34a69f34ee40fa24a7e8fc4f961ae00 /dist/css/bootstrap.css | |
| parent | b886fd2f012f3ebe68292aaedf55d5c3709f972b (diff) | |
| parent | b1721f42cc8298fb691530614ee6d52389872e25 (diff) | |
| download | bootstrap-689e75e4b1b8055e657b30eb692b34ebf9d549da.tar.xz bootstrap-689e75e4b1b8055e657b30eb692b34ebf9d549da.zip | |
Merge branch 'master' into text-emphasis-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); |