diff options
| author | Mark Otto <[email protected]> | 2014-01-15 15:01:50 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-01-15 15:01:50 -0800 |
| commit | 0335b8df521e78befa7c91b9d7d0bff77aa310ad (patch) | |
| tree | fc26dac3c0dd545ee4441a244cd7f2c3a0f23f1b | |
| parent | 6986bdb2a7a0e4b98d905e9de029ffac141c6b8d (diff) | |
| parent | 91c6419d0924dc36ad6599519c2afc53e6a33721 (diff) | |
| download | bootstrap-0335b8df521e78befa7c91b9d7d0bff77aa310ad.tar.xz bootstrap-0335b8df521e78befa7c91b9d7d0bff77aa310ad.zip | |
Merge branch 'master' of github.com:twbs/bootstrap
| -rw-r--r-- | README.md | 4 | ||||
| -rw-r--r-- | _config.yml | 1 | ||||
| -rw-r--r-- | docs/getting-started.html | 2 |
3 files changed, 4 insertions, 3 deletions
@@ -64,9 +64,9 @@ Bootstrap's documentation, included in this repo in the root directory, is built ### Running documentation locally 1. If necessary, [install Jekyll](http://jekyllrb.com/docs/installation) (requires v1.x). - - **Windows users:** read [this unofficial guide](https://github.com/juthilo/run-jekyll-on-windows/) to get Jekyll up and running without problems. + - **Windows users:** Read [this unofficial guide](https://github.com/juthilo/run-jekyll-on-windows/) to get Jekyll up and running without problems. We use Pygments for syntax highlighting, so make sure to read the sections on installing Python and Pygments. 2. From the root `/bootstrap` directory, run `jekyll serve` in the command line. - - **Windows users:** For Ruby 2.0.0 run `chcp 65001` first to change the command prompt's character encoding ([code page](http://en.wikipedia.org/wiki/Windows_code_page)) to UTF-8 so Jekyll runs without errors. For Ruby 1.9.3 you can alternatively do `SET LANG=en_EN.UTF-8`. In addition, ensure you have Python installed and added in your `PATH` or the build will fail due to our Pygments dependency. + - **Windows users:** While we use Jekyll's `encoding` setting, you might still need to change the command prompt's character encoding ([code page](http://en.wikipedia.org/wiki/Windows_code_page)) to UTF-8 so Jekyll runs without errors. For Ruby 2.0.0, run `chcp 65001` first. For Ruby 1.9.3, you can alternatively do `SET LANG=en_EN.UTF-8`. 3. Open <http://localhost:9001> in your browser, and voilà. Learn more about using Jekyll by reading its [documentation](http://jekyllrb.com/docs/home/). diff --git a/_config.yml b/_config.yml index 14d1f6455..8e0a0b31c 100644 --- a/_config.yml +++ b/_config.yml @@ -12,6 +12,7 @@ host: 0.0.0.0 port: 9001 baseurl: / url: http://localhost:9001 +encoding: UTF-8 # Custom vars current_version: 3.0.3 diff --git a/docs/getting-started.html b/docs/getting-started.html index b2edf0722..bb4783b3b 100644 --- a/docs/getting-started.html +++ b/docs/getting-started.html @@ -875,7 +875,7 @@ if (navigator.userAgent.match(/IEMobile\/10\.0/)) { <h4>Navbar Dropdowns</h4> <p>The <code>.dropdown-backdrop</code> element isn't used on iOS in the nav because of the complexity of z-indexing. Thus, to close dropdowns in navbars, you must directly click the dropdown element (or any other element which will fire a click event in iOS).</p> - <h3 id="support-browser-zoom">Browser zooming</h3> + <h3 id="support-browser-zooming">Browser zooming</h3> <p>Page zooming inevitably presents rendering artifacts in some components, both in Bootstrap and the rest of the web. Depending on the issue, we may be able to fix it (search first and then open an issue if need be). However, we tend to ignore these as they often have no direct solution other than hacky workarounds.</p> <h3 id="support-android-stock-browser">Android stock browser</h3> |