2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-02 16:04:07 +03:00

Merge branch 'master' into icon_paths

This commit is contained in:
Mark Otto
2014-05-20 23:21:12 -07:00
48 changed files with 191 additions and 125 deletions
+1 -1
View File
@@ -2,5 +2,5 @@
.resizable(@direction) {
resize: @direction; // Options: horizontal, vertical, both
overflow: auto; // Safari fix
overflow: auto; // Per CSS3 UI, `resize` only applies when `overflow` isn't `visible`
}
+2 -1
View File
@@ -14,7 +14,8 @@
// For more information, see the following:
//
// Issue: https://github.com/twbs/bootstrap/issues/10497
// Docs: http://getbootstrap.com/getting-started/#browsers
// Docs: http://getbootstrap.com/getting-started/#support-ie10-width
// Source: http://timkadlec.com/2013/01/windows-phone-8-and-device-width/
// Source: http://timkadlec.com/2012/10/ie10-snap-mode-and-responsive-design/
@-ms-viewport {