diff options
| author | Mark Otto <[email protected]> | 2013-10-14 11:06:25 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-10-14 11:06:25 -0700 |
| commit | 6307d2c94d879e802610e366087bff75883d70a4 (patch) | |
| tree | 1c43da1bf8d67c1fff25fe19033451176cd56ee3 /getting-started.html | |
| parent | 1f5c754d576f9534da2cc2176bf2193d31ed6937 (diff) | |
| parent | 70278a4e4f6c2e9079d72a2993b69efd3a965ba0 (diff) | |
| download | bootstrap-6307d2c94d879e802610e366087bff75883d70a4.tar.xz bootstrap-6307d2c94d879e802610e366087bff75883d70a4.zip | |
Merge branch 'master' of github.com:twbs/bootstrap
Conflicts:
getting-started.html
Diffstat (limited to 'getting-started.html')
| -rw-r--r-- | getting-started.html | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/getting-started.html b/getting-started.html index b610d09e0..c088a2b2c 100644 --- a/getting-started.html +++ b/getting-started.html @@ -110,10 +110,11 @@ bootstrap/ <!-- Bootstrap --> <link href="css/bootstrap.min.css" rel="stylesheet" media="screen"> - <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries --> + <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries --> + <!-- WARNING: Respond.js doesn't work if you view the page via file:// --> <!--[if lt IE 9]> <script src="https://oss.maxcdn.com/libs/html5shiv/3.6.2/html5shiv.js"></script> - <script src="../../docs-assets/js/respond.min.js"></script> + <script src="https://oss.maxcdn.com/libs/respond.js/1.3.0/respond.min.js"></script> <![endif]--> </head> <body> @@ -702,7 +703,15 @@ bootstrap/ <p>Unofficially, Bootstrap should look and behave well enough in Chromium and Chrome for Linux, Firefox for Linux, and Internet Explorer 7, though they are not officially supported.</p> <h3>Internet Explorer 8 and 9</h3> - <p>Internet Explorer 8 and 9 are also supported, however, please be aware that some CSS3 properties and HTML5 elements are not fully supported by these browsers. In addition, <strong>Internet Explorer 8 requires the use of <a href="https://github.com/scottjehl/Respond">respond.js</a> to enable media query support.</strong></p> + <p>Internet Explorer 8 and 9 are also supported, however, please be aware that some CSS3 properties and HTML5 elements are not fully supported by these browsers. In addition, <strong>Internet Explorer 8 requires the use of <a href="https://github.com/scottjehl/Respond">Respond.js</a> to enable media query support.</strong></p> + <div class="bs-callout bs-callout-warning" id="respond-js-x-domain"> + <h4>Respond.js and cross-domain CSS</h4> + <p>Using Respond.js with CSS hosted on a different (sub)domain (for example, on a CDN) requires some additional setup. <a href="https://github.com/scottjehl/Respond/blob/master/README.md#cdnx-domain-setup">See the Respond.js docs</a> for details.</p> + </div> + <div class="bs-callout bs-callout-warning" id="respond-file-proto"> + <h4>Respond.js and <code>file://</code></h4> + <p>Due to browser security rules, Respond.js doesn't work with pages viewed via the <code>file://</code> protocol (like when opening a local HTML file). To test responsive features in IE8, view your pages over HTTP(S). <a href="https://github.com/scottjehl/Respond/blob/master/README.md#support--caveats">See the Respond.js docs</a> for details.</p> + </div> <div class="table-responsive"> <table class="table table-bordered table-striped"> <thead> |