diff options
| author | Mark Otto <[email protected]> | 2013-08-15 12:35:46 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-08-15 12:35:46 -0700 |
| commit | 834cbce9b75232d8dd3fcfb2fa86ffef02c9cfd8 (patch) | |
| tree | 19d196ee87a9fbd16b1aba62151baec49ecaccca | |
| parent | 33edb95b9862ef0c0edea73ca931fcbbeb1b5b6d (diff) | |
| parent | bc89c06b6c8cdf0d77a8635c32650df4fafc4b04 (diff) | |
| download | bootstrap-834cbce9b75232d8dd3fcfb2fa86ffef02c9cfd8.tar.xz bootstrap-834cbce9b75232d8dd3fcfb2fa86ffef02c9cfd8.zip | |
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
| -rw-r--r-- | getting-started.html | 14 | ||||
| -rw-r--r-- | javascript.html | 4 |
2 files changed, 9 insertions, 9 deletions
diff --git a/getting-started.html b/getting-started.html index fc495aeae..fdb703dd9 100644 --- a/getting-started.html +++ b/getting-started.html @@ -131,14 +131,14 @@ bootstrap/ <div class="page-header"> <h1 id="disable-responsive">Disabling responsiveness</h1> </div> - <p class="lead">Don't want your site or application to be scale on different device? With a little bit of work you can disable the responsive features of Bootstrap so that mobile users see your full desktop-version site.</p> + <p class="lead">Don't want your site or application to be scale on different device? With a little bit of work, you can disable the responsive features of Bootstrap so that mobile users see your full desktop-version site.</p> <h3>Steps to disable responsive views</h3> <p>To disable responsive features, follow these steps. See it in action in the modified template below.</p> <ol> - <li>Remove (or just don't add) the meta viewport mentioned in <a href="../css/#overview-mobile">the CSS docs</a></li> - <li>Force a single <code>max-width</code> on the <code>.container</code> (e.g., <code>.container { max-width: 940px; }</code>). Be sure this comes after the default Bootstrap CSS otherwise you'll need <code>!important</code>.</li> - <li>For grid layouts, make use of <code>.col-xs-*</code> classes in addition to or in place of the medium/large ones. Don't worry, the extra small device grid scales up to all resolutions, so you're set there.</li> + <li>Remove (or just don't add) the viewport <code><meta></code> mentioned in <a href="../css/#overview-mobile">the CSS docs</a></li> + <li>Force a single <code>max-width</code> on the <code>.container</code> (e.g., <code>.container { max-width: 940px; }</code>). Be sure that this comes after the default Bootstrap CSS; otherwise, you'll need <code>!important</code>.</li> + <li>For grid layouts, make use of <code>.col-xs-*</code> classes in addition to or in place of the medium/large ones. Don't worry, the extra-small device grid scales up to all resolutions, so you're set there.</li> </ol> <p>You'll still need respond.js for IE8 (since our media queries are still there and need to be picked up). This just disables the "mobile site" of Bootstrap.</p> @@ -228,13 +228,13 @@ bootstrap/ {% highlight js %} if (navigator.userAgent.match(/IEMobile\/10\.0/)) { - var msViewportStyle = document.createElement("style"); + var msViewportStyle = document.createElement("style") msViewportStyle.appendChild( document.createTextNode( "@-ms-viewport{width:auto!important}" ) - ); - document.getElementsByTagName("head")[0].appendChild(msViewportStyle); + ) + document.getElementsByTagName("head")[0].appendChild(msViewportStyle) } {% endhighlight %} <p>For more information and usage guidelines, read <a href="http://timkadlec.com/2013/01/windows-phone-8-and-device-width/">Windows Phone 8 and Device-Width</a>.</p> diff --git a/javascript.html b/javascript.html index cbbb35368..2889ac084 100644 --- a/javascript.html +++ b/javascript.html @@ -588,7 +588,7 @@ $('body').scrollspy({ target: '#navbar-example' }) {% highlight js %} $('[data-spy="scroll"]').each(function () { var $spy = $(this).scrollspy('refresh') -}); +}) {% endhighlight %} @@ -731,7 +731,7 @@ $('#myTab li:eq(2) a').tab('show') // Select third tab (0-indexed) <script> $(function () { - $('#myTab a:last').tab('show'); + $('#myTab a:last').tab('show') }) </script> {% endhighlight %} |
