diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000000..ad9d6beae3
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,14 @@
+# editorconfig.org
+
+root = true
+
+[*]
+indent_style = space
+indent_size = 2
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[Makefile]
+indent_style = tab
diff --git a/.gitignore b/.gitignore
index ace28e663f..afa0159a65 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,6 +13,7 @@ _gh_pages
*.vi
*~
*.sass-cache
+*.ruby-version
# OS or Editor folders
.DS_Store
diff --git a/.travis.yml b/.travis.yml
index b8e1f17207..2d26206d58 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,3 @@
language: node_js
node_js:
- - 0.6
\ No newline at end of file
+ - 0.6
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 154fb2c528..f33f97937b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -357,4 +357,4 @@ Complete rewrite of the library. For full details, head to the upgrading doc at
- Bug fixes
## v1.0.0
-- **Initial release**
\ No newline at end of file
+- **Initial release**
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index c97e8b81ee..463bfca781 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -9,7 +9,7 @@ Looking to contribute something to Bootstrap? **Here's how you can help.**
We only accept issues that are bug reports or feature requests. Bugs must be isolated and reproducible problems that we can fix within the Bootstrap core. Please read the following guidelines before opening any issue.
1. **Search for existing issues.** We get a lot of duplicate issues, and you'd help us out a lot by first checking if someone else has reported the same issue. Moreover, the issue may have already been resolved with a fix available.
-2. **Create an isolated and reproducible test case.** Be sure the problem exists in Bootstrap's code with a [reduced test cases](http://css-tricks.com/reduced-test-cases/) that should be included in each bug report.
+2. **Create an isolated and reproducible test case.** Be sure the problem exists in Bootstrap's code with a [reduced test case](http://css-tricks.com/reduced-test-cases/) that should be included in each bug report.
3. **Include a live example.** Make use of jsFiddle or jsBin to share your isolated test cases.
4. **Share as much information as possible.** Include operating system and version, browser and version, version of Bootstrap, customized or vanilla build, etc. where appropriate. Also include steps to reproduce the bug.
diff --git a/LICENSE b/LICENSE
index 2bb9ad240f..d9a10c0d8e 100644
--- a/LICENSE
+++ b/LICENSE
@@ -173,4 +173,4 @@
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.
- END OF TERMS AND CONDITIONS
\ No newline at end of file
+ END OF TERMS AND CONDITIONS
diff --git a/Makefile b/Makefile
index 48aacdf08a..7c95b19001 100644
--- a/Makefile
+++ b/Makefile
@@ -88,8 +88,6 @@ bootstrap/css/*.css: less/*.less
mkdir -p bootstrap/css
recess --compile ${BOOTSTRAP_LESS} > bootstrap/css/bootstrap.css
recess --compress ${BOOTSTRAP_LESS} > bootstrap/css/bootstrap.min.css
- recess --compile ${BOOTSTRAP_RESPONSIVE_LESS} > bootstrap/css/bootstrap-responsive.css
- recess --compress ${BOOTSTRAP_RESPONSIVE_LESS} > bootstrap/css/bootstrap-responsive.min.css
#
# FONTS
diff --git a/README.md b/README.md
index 321e0e4606..7579d3a992 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,3 @@
-
-
-
-
# [Bootstrap v3.0.0](http://getbootstrap.com) [](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).
@@ -16,7 +12,7 @@ Three quick start options are available:
* [Download the latest release](https://github.com/twitter/bootstrap/zipball/master).
* Clone the repo: `git clone git://github.com/twitter/bootstrap.git`.
-* Install with Twitter's [Bower](http://twitter.github.com/bower): `bower install bootstrap`.
+* Install with Twitter's [Bower](http://github.com/bower/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.
@@ -55,14 +51,17 @@ $ npm install
When completed, you'll be able to run the various make commands provided:
-#### build - `make` or `make bootstrap`
-`make` runs the Recess compiler to rebuild the `/less` files and compile the docs. `make bootstrap` creates the `/bootstrap` directory with compiled files. **Requires recess and uglify-js.**
+#### Build - `make`
+`make` runs the Recess compiler to rebuild the `/less` files and compile the docs. **Requires recess and uglify-js.**
-#### test - `make test`
+#### Compile CSS, JS, and fonts - `make bootstrap`
+`make bootstrap` creates the `/bootstrap` directory with compiled files. **Requires recess and uglify-js.**
+
+#### Tests - `make test`
Runs jshint and qunit tests headlessly in [phantomjs](http://code.google.com/p/phantomjs/) (used for ci). **Requires phantomjs.**
-#### watch - `make watch`
-This is a convenience method for watching just Less files and automatically building them whenever you save. **Requires the Watchr gem.**
+#### Watch - `make watch`
+This is a convenience method for watching just Less files and automatically building them whenever you save. **Requires the watchr gem.**
Should you encounter problems with installing dependencies or running the makefile commands, uninstall any previous versions (global and local) you may have installed, and then rerun `npm install`.
@@ -72,6 +71,8 @@ Should you encounter problems with installing dependencies or running the makefi
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).
+Editor preferences are also available in the [editor config](.editorconfig) for easy application in common text editors. Read more and download plugins at [http://editorconfig.com](http://editorconfig.com).
+
## Community
diff --git a/component.json b/component.json
index 96617807d6..f246145ee2 100644
--- a/component.json
+++ b/component.json
@@ -5,4 +5,4 @@
"dependencies": {
"jquery": "~1.8.0"
}
-}
\ No newline at end of file
+}
diff --git a/docs/_includes/colophon.html b/docs/_includes/colophon.html
index 5c15d7c787..5018113b41 100644
--- a/docs/_includes/colophon.html
+++ b/docs/_includes/colophon.html
@@ -1,7 +1,7 @@