From 48c64127b37be4a692a70cb7b38ed9744163582b Mon Sep 17 00:00:00 2001 From: Thomas Park Date: Wed, 30 Oct 2013 16:13:42 -0400 Subject: 3.0.0 -> 3.0.1 --- .../bootstrap/examples/grid/index.html | 53 +++++++++++++++++----- 1 file changed, 41 insertions(+), 12 deletions(-) (limited to 'bower_components/bootstrap/examples/grid') diff --git a/bower_components/bootstrap/examples/grid/index.html b/bower_components/bootstrap/examples/grid/index.html index 239b0d16..be1e39c1 100755 --- a/bower_components/bootstrap/examples/grid/index.html +++ b/bower_components/bootstrap/examples/grid/index.html @@ -2,10 +2,11 @@ + - + Grid Template for Bootstrap @@ -15,10 +16,13 @@ + + + @@ -87,8 +91,8 @@
.col-xs-6 .col-md-4
-
.col-xs-6 .col-md-6
-
.col-xs-6 .col-md-6
+
.col-xs-6
+
.col-xs-6
@@ -96,19 +100,44 @@

Mixed: mobile, tablet, and desktop

-
.col-xs-12 .col-lg-8
-
.col-xs-6 .col-lg-4
+
.col-xs-12 .col-sm-6 .col-lg-8
+
.col-xs-6 .col-lg-4
+
+
+
.col-xs-6 .col-sm-4
+
.col-xs-6 .col-sm-4
+
.col-xs-6 .col-sm-4
+
+ +
+ +

Column clearing

+

Clear floats at specific breakpoints to prevent awkward wrapping with uneven content.

+
+
.col-xs-6 .col-sm-3
+
.col-xs-6 .col-sm-3
+ + +
+ +
.col-xs-6 .col-sm-3
+
.col-xs-6 .col-sm-3
+ +
+ +

Offset, push, and pull resets

+

Reset offsets, pushes, and pulls at specific breakpoints.

-
.col-xs-6 .col-sm-4 .col-lg-4
-
.col-xs-6 .col-sm-4 .col-lg-4
-
.col-xs-6 .col-sm-4 .col-lg-4
+
.col-sm-5 .col-md-6
+
.col-sm-5 .col-sm-offset-2 .col-md-6 .col-md-offset-0
-
.col-xs-6 .col-sm-6 .col-lg-6
-
.col-xs-6 .col-sm-6 .col-lg-6
+
.col-sm-6 .col-md-5 .col-lg-6
+
.col-sm-6 .col-md-5 .col-md-offset-2 .col-lg-6 .col-lg-offset-0
+ -- cgit v1.2.3