1
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-22 13:13:03 +02:00

Merge branch 'master' of github.com:twbs/bootstrap

Conflicts:
	dist/css/bootstrap.min.css
This commit is contained in:
Mark Otto
2013-09-11 16:35:27 -07:00
6 changed files with 50 additions and 29 deletions

View File

@@ -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;