diff options
| author | Mark Otto <[email protected]> | 2013-08-18 23:52:22 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-08-18 23:52:22 -0700 |
| commit | f7a7cb479fa53b38524f2f79cac262a0736be97b (patch) | |
| tree | ef2122dae6256521b6c113a055ec2a4920f6092e | |
| parent | 7dcfc44426dc7c294c2c0cb6b0469c3db1baa485 (diff) | |
| parent | c0f477a1075321614db8a628fb0046207b5f455b (diff) | |
| download | bootstrap-f7a7cb479fa53b38524f2f79cac262a0736be97b.tar.xz bootstrap-f7a7cb479fa53b38524f2f79cac262a0736be97b.zip | |
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
Conflicts:
getting-started.html
| -rw-r--r-- | assets/js/customizer.js | 4 | ||||
| -rw-r--r-- | getting-started.html | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/assets/js/customizer.js b/assets/js/customizer.js index 9ecf52ee2..6e9484b08 100644 --- a/assets/js/customizer.js +++ b/assets/js/customizer.js @@ -1,5 +1,5 @@ window.onload = function () { // wait for load in a dumb way because B-0 - var cw = '/*!\n * Bootstrap v3.0.0-rc.2\n *\n * Copyright 2013 Twitter, Inc\n * Licensed under the Apache License v2.0\n * http://www.apache.org/licenses/LICENSE-2.0\n *\n * Designed and built with all the love in the world @twitter by @mdo and @fat.\n */\n\n' + var cw = '/*!\n * Bootstrap v3.0.0\n *\n * Copyright 2013 Twitter, Inc\n * Licensed under the Apache License v2.0\n * http://www.apache.org/licenses/LICENSE-2.0\n *\n * Designed and built with all the love in the world @twitter by @mdo and @fat.\n */\n\n' function showError(msg, err) { $('<div id="bsCustomizerAlert" class="bs-customizer-alert">\ @@ -274,4 +274,4 @@ window.onload = function () { // wait for load in a dumb way because B-0 } parseUrl() -}
\ No newline at end of file +} diff --git a/getting-started.html b/getting-started.html index b359b596c..476a7ddde 100644 --- a/getting-started.html +++ b/getting-started.html @@ -83,7 +83,7 @@ bootstrap/ └── glyphicons-halflings-regular.woff {% endhighlight %} - <p>This is the most basic form of Bootstrap: compiled files for quick drop-in usage in nearly any web project. We provide compiled CSS and JS (<code>bootstrap.*</code>), as well as compiled and minified CSS and JS (<code>bootstrap.min.*</code>). Fonts from Glyphicons are included, as is the optional Bootstrap v2 theme.</p> + <p>This is the most basic form of Bootstrap: compiled files for quick drop-in usage in nearly any web project. We provide compiled CSS and JS (<code>bootstrap.*</code>), as well as compiled and minified CSS and JS (<code>bootstrap.min.*</code>). Fonts from Glyphicons are included, as is the optional Bootstrap theme.</p> <div class="bs-callout bs-callout-danger"> <h4>jQuery required</h4> <p>Please note that <strong>all JavaScript plugins require jQuery</strong> to be included, as shown in the <a href="#template">starter template</a>.</p> |