Merge branch '2.0.3-wip'

Conflicts:
	Makefile
	docs/assets/js/bootstrap.js
	docs/assets/js/bootstrap.min.js

1 files changed, 49 insertions, 0 deletions

diff --git a/less/tests/css-tests.css b/less/tests/css-tests.css
new file mode 100644
index 000000000..a4f07e936
--- /dev/null
+++ b/less/tests/css-tests.css
@@ -0,0 +1,49 @@
+/*!
+ * Bootstrap CSS Tests
+ */
+
+
+/* Remove background image */
+body {
+  background-image: none;
+}
+
+/* Space out subhead */
+.subhead {
+  margin-bottom: 36px;
+}
+h4 {
+  margin-bottom: 5px;
+}
+
+
+/* colgroup tests */
+.col1 {
+  background-color: rgba(255,0,0,.1);
+}
+.col2 {
+  background-color: rgba(0,255,0,.1);
+}
+.col3 {
+  background-color: rgba(0,0,255,.1);
+}
+
+
+/* Fluid row inputs */
+#fluidRowInputs .row-fluid > [class*=span] {
+  background-color: rgba(255,0,0,.1);
+}
+
+
+/* Fluid grid */
+.fluid-grid .row {
+  height: 60px;
+  padding-top: 10px;
+  margin-top: 10px;
+  color: #fff;
+  text-align: center;
+  background-color: #eee;
+}
+.fluid-grid .span1 {
+  background-color: #999;
+}