diff options
| author | Mark Otto <[email protected]> | 2013-09-11 16:35:27 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-09-11 16:35:27 -0700 |
| commit | d88e743b417c3e149c9fcb02c8d5580afb8baee0 (patch) | |
| tree | d8018f676ed81eb5ec5dcbfbb990ca4aa6d300fd /dist/css/bootstrap.css | |
| parent | fddcadbc21cf35fb584ab02dc0817612da6596a4 (diff) | |
| parent | 725e2b9ccf66cd54e64ff5d15bf8b2744b5122cd (diff) | |
| download | bootstrap-d88e743b417c3e149c9fcb02c8d5580afb8baee0.tar.xz bootstrap-d88e743b417c3e149c9fcb02c8d5580afb8baee0.zip | |
Merge branch 'master' of github.com:twbs/bootstrap
Conflicts:
dist/css/bootstrap.min.css
Diffstat (limited to 'dist/css/bootstrap.css')
| -rw-r--r-- | dist/css/bootstrap.css | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 87ccb4ec1..6a08d995a 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -6346,12 +6346,6 @@ body.modal-open, width: device-width; } -@media screen and (max-width: 400px) { - @-ms-viewport { - width: 320px; - } -} - .hidden { display: none !important; visibility: hidden !important; |