diff --git a/.gitignore b/.gitignore
index 3b10ffb384..ace28e663f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,6 @@
+# Ignore compiled docs
+_gh_pages
+
# Numerous always-ignore extensions
*.diff
*.err
diff --git a/Makefile b/Makefile
index acc4d11bfb..57393d1049 100644
--- a/Makefile
+++ b/Makefile
@@ -1,39 +1,36 @@
BOOTSTRAP = ./docs/assets/css/bootstrap.css
BOOTSTRAP_LESS = ./less/bootstrap.less
DATE=$(shell date +%I:%M%p)
-CHECK=\033[32m✔\033[39m
-HR=\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#
-
+CHECK=\033[32m✔ Done\033[39m
+HR=\033[37m--------------------------------------------------\033[39m
#
# BUILD DOCS
#
build:
- @echo "\n${HR}"
- @echo "Building Bootstrap..."
- @echo "${HR}\n"
+ @echo "\n\n"
+ @echo "\033[36mBuilding Bootstrap...\033[39m"
+ @echo "${HR}"
@jshint js/*.js --config js/.jshintrc
@jshint js/tests/unit/*.js --config js/.jshintrc
- @echo "Running JSHint on javascript... ${CHECK} Done"
+ @echo "Running JSHint on javascript... ${CHECK}"
@./node_modules/.bin/recess --compile ${BOOTSTRAP_LESS} > ${BOOTSTRAP}
- @echo "Compiling LESS with Recess... ${CHECK} Done"
- @node docs/build
+ @echo "Compiling LESS with Recess... ${CHECK}"
@cp fonts/* docs/assets/fonts/
@cp js/*.js docs/assets/js/
@cp js/tests/vendor/jquery.js docs/assets/js/
- @echo "Compiling documentation... ${CHECK} Done"
+ @echo "Prepping fonts and JavaScript... ${CHECK}"
@cat js/bootstrap-transition.js js/bootstrap-alert.js js/bootstrap-button.js js/bootstrap-carousel.js js/bootstrap-collapse.js js/bootstrap-dropdown.js js/bootstrap-modal.js js/bootstrap-tooltip.js js/bootstrap-popover.js js/bootstrap-scrollspy.js js/bootstrap-tab.js js/bootstrap-typeahead.js js/bootstrap-affix.js > docs/assets/js/bootstrap.js
@./node_modules/.bin/uglifyjs -nc docs/assets/js/bootstrap.js > docs/assets/js/bootstrap.min.tmp.js
@echo "/**\n* Bootstrap.js v3.0.0 by @fat & @mdo\n* Copyright 2012 Twitter, Inc.\n* http://www.apache.org/licenses/LICENSE-2.0.txt\n*/" > docs/assets/js/copyright.js
@cat docs/assets/js/copyright.js docs/assets/js/bootstrap.min.tmp.js > docs/assets/js/bootstrap.min.js
@rm docs/assets/js/copyright.js docs/assets/js/bootstrap.min.tmp.js
- @echo "Compiling and minifying javascript... ${CHECK} Done"
- @echo "\n${HR}"
- @echo "Bootstrap successfully built at ${DATE}."
- @echo "${HR}\n"
- @echo "Thanks for using Bootstrap,"
- @echo "<3 @mdo and @fat\n"
+ @echo "Compiling and minifying javascript... ${CHECK}"
+ @echo "${HR}"
+ @echo "\033[36mSuccess!\n\033[39m"
+ @echo "\033[37mThanks for using Bootstrap,"
+ @echo "<3 @mdo and @fat\n\033[39m"
#
# RUN JSHINT & QUNIT TESTS IN PHANTOMJS
diff --git a/README.md b/README.md
index 786453e0e5..d1ade87419 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
-# [Bootstrap v3.0.0](http://twitter.github.com/bootstrap) [![Build Status](https://secure.travis-ci.org/twitter/bootstrap.png)](http://travis-ci.org/twitter/bootstrap)
+# [Bootstrap v3.0.0](http://getbootstrap.com) [![Build Status](https://secure.travis-ci.org/twitter/bootstrap.png)](http://travis-ci.org/twitter/bootstrap)
Bootstrap is a sleek, intuitive, and powerful front-end framework for faster and easier web development, created and maintained by [Mark Otto](http://twitter.com/mdo) and [Jacob Thornton](http://twitter.com/fat).
@@ -18,6 +18,8 @@ Three quick start options are available:
* Clone the repo: `git clone git://github.com/twitter/bootstrap.git`.
* Install with Twitter's [Bower](http://twitter.github.com/bower): `bower install bootstrap`.
+Read the [Getting Started page](http://getbootstrap.com/getting-started/) for information on the framework contents, basic template guidelines, and more.
+
## Versioning
@@ -38,7 +40,7 @@ For more information on SemVer, please visit [http://semver.org/](http://semver.
-## Bug tracker
+## Bugs and feature requests
Have a bug or a feature request? [Please open a new issue](https://github.com/twitter/bootstrap/issues). Before opening any issue, please search for existing issues and read the [Issue Guidelines](https://github.com/necolas/issue-guidelines), written by [Nicolas Gallagher](https://github.com/necolas/).
@@ -55,24 +57,31 @@ Keep track of development and community news.
-## Developers
+## Documentation
-We have included a makefile with convenience methods for working with the Bootstrap library.
+Bootstrap's docs are built using [Jekyll](http://jekyllrb.com) and hosted on GitHub Pages at [http://getbootstrap.com](http://getbootstrap.com). To view our docs locally, you'll need to [install Jekyll](https://github.com/mojombo/jekyll/wiki/install) to run a local server.
-+ **dependencies**
-Our makefile depends on you having recess, connect, uglify.js, and jshint installed. To install, just run the following command in npm:
+Documentation for [previous versions](https://github.com/twitter/bootstrap/tags) is also available via tags.
+
+
+
+## Compiling CSS and JavaScript
+
+Bootstrap includes a makefile with convenient methods for working with the framework. Before getting started, be sure to install the necessary local dependencies:
```
-$ npm install recess connect uglify-js jshint -g
+$ npm install
```
-+ **build** - `make`
-Runs the recess compiler to rebuild the `/less` files and compiles the docs pages. Requires recess and uglify-js.
+Once installed, you'll be able to run the various make commands provided:
-+ **test** - `make test`
+#### build - `make`
+Runs the recess compiler to rebuild the `/less` files and compiles the docs. Requires recess and uglify-js.
+
+#### test - `make test`
Runs jshint and qunit tests headlessly in [phantomjs](http://code.google.com/p/phantomjs/) (used for ci). Depends on having phantomjs installed.
-+ **watch** - `make watch`
+#### watch - `make watch`
This is a convenience method for watching just Less files and automatically building them whenever you save. Requires the Watchr gem.
@@ -81,8 +90,6 @@ This is a convenience method for watching just Less files and automatically buil
Please submit all pull requests against *-wip branches. If your pull request contains JavaScript patches or features, you must include relevant unit tests. All HTML and CSS should conform to the [Code Guide](http://github.com/mdo/code-guide), maintained by [Mark Otto](http://github.com/mdo).
-Thanks!
-
## Authors
diff --git a/_config.yml b/_config.yml
new file mode 100644
index 0000000000..df0aece1cf
--- /dev/null
+++ b/_config.yml
@@ -0,0 +1,13 @@
+# Dependencies
+markdown: rdiscount
+pygments: true
+
+# Permalinks
+permalink: pretty
+
+# Server
+auto: true
+source: ./docs
+destination: ./_gh_pages
+url: http://bootstrap.dev:9001
+server_port: 9001
diff --git a/docs/_includes/colophon.html b/docs/_includes/colophon.html
new file mode 100644
index 0000000000..ae92db140c
--- /dev/null
+++ b/docs/_includes/colophon.html
@@ -0,0 +1,35 @@
+
+
\ No newline at end of file
diff --git a/docs/_includes/footer.html b/docs/_includes/footer.html
new file mode 100644
index 0000000000..c91c7d00ed
--- /dev/null
+++ b/docs/_includes/footer.html
@@ -0,0 +1,39 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/docs/_includes/header.html b/docs/_includes/header.html
new file mode 100644
index 0000000000..fe23d008e6
--- /dev/null
+++ b/docs/_includes/header.html
@@ -0,0 +1,43 @@
+
+
+
+
+
+