Merge remote-tracking branch 'bootstrap/3.0.0-wip' into 3.0.0-wip

Conflicts:
	js/tests/unit/bootstrap-collapse.js

1 files changed, 56 insertions, 0 deletions

diff --git a/docs/examples/grid.html b/docs/examples/grid.html
new file mode 100644
index 000000000..580f69cbf
--- /dev/null
+++ b/docs/examples/grid.html
@@ -0,0 +1,56 @@
+---
+layout: example
+title: Grid template
+---
+
+<!-- Custom styles for this template -->
+<style>
+
+  .container {
+    padding-left: 15px;
+    padding-right: 15px;
+  }
+
+  .row {
+    margin-bottom: 20px;
+    margin-left: -15px;
+    margin-right: -15px;
+  }
+  [class*="col-lg-"] {
+    padding-top: 15px;
+    padding-bottom: 15px;
+    background-color: #f5f5f5;
+    border: 1px solid #e5e5e5;
+  }
+</style>
+
+
+<div class="container">
+
+  <h2>Bootstrap grids</h2>
+  <p class="lead">Basic grid layouts to get you familiar with building within the Bootstrap grid system.</p>
+
+  <h4>Three equal columns</h4>
+  <div class="row">
+    <div class="col col-lg-4">.col .col-lg-4</div>
+    <div class="col col-lg-4">.col .col-lg-4</div>
+    <div class="col col-lg-4">.col .col-lg-4</div>
+  </div>
+
+  <h4>Three unequal columns</h4>
+  <div class="row">
+    <div class="col col-lg-3">.col .col-lg-3</div>
+    <div class="col col-lg-6">.col .col-lg-6</div>
+    <div class="col col-lg-3">.col .col-lg-3</div>
+  </div>
+
+  <h4>Two columns</h4>
+  <div class="row">
+    <div class="col col-lg-8">.col .col-lg-8</div>
+    <div class="col col-lg-4">.col .col-lg-4</div>
+  </div>
+
+  <h4>Full width, single column</h4>
+  <p class="text-muted">No grid classes are necessary for full-width elements.</p>
+
+</div> <!-- /container -->