From 414997baa83858b43e9f45af90097f93ed2d6797 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 6 Feb 2016 10:51:59 -0800 Subject: [PATCH] flip things around again, no more base class, try out some new stuff to keep responsive flex grid working --- docs/_layouts/docs.html | 4 +- docs/assets/scss/_component-examples.scss | 6 +- docs/examples/blog/index.html | 4 +- docs/examples/carousel/index.html | 18 ++-- docs/examples/dashboard/index.html | 12 +-- docs/examples/grid/index.html | 94 +++++++++--------- docs/examples/jumbotron/index.html | 6 +- docs/examples/justified-nav/index.html | 6 +- docs/examples/narrow-jumbotron/index.html | 4 +- docs/examples/offcanvas/index.html | 16 +-- docs/layout/flexbox-grid.md | 68 +++++++------ docs/layout/grid.md | 116 +++++++++++----------- scss/_grid.scss | 12 +-- scss/mixins/_grid-framework.scss | 18 +++- scss/mixins/_grid.scss | 19 +++- 15 files changed, 216 insertions(+), 187 deletions(-) diff --git a/docs/_layouts/docs.html b/docs/_layouts/docs.html index 92d95dca70..e57dfdd3cc 100644 --- a/docs/_layouts/docs.html +++ b/docs/_layouts/docs.html @@ -21,10 +21,10 @@
-
+
{% include nav-docs.html %}
-
+

{{ page.title }}

{{ content }}
diff --git a/docs/assets/scss/_component-examples.scss b/docs/assets/scss/_component-examples.scss index 79067275c1..64ee929502 100644 --- a/docs/assets/scss/_component-examples.scss +++ b/docs/assets/scss/_component-examples.scss @@ -3,9 +3,11 @@ // .bd-example-row { - .row { - margin-bottom: 1rem; + .row + .row { + margin-top: 1rem; + } + .row { > .col, > [class^="col-"] { padding-top: .75rem; diff --git a/docs/examples/blog/index.html b/docs/examples/blog/index.html index 014e0a6c10..d4e9dbcc55 100644 --- a/docs/examples/blog/index.html +++ b/docs/examples/blog/index.html @@ -43,7 +43,7 @@
-
+

Sample blog post

@@ -111,7 +111,7 @@
-
+

About

Etiam porta sem malesuada magna mollis euismod. Cras mattis consectetur purus sit amet fermentum. Aenean lacinia bibendum nulla sed consectetur.

diff --git a/docs/examples/carousel/index.html b/docs/examples/carousel/index.html index 55ecc1953b..986c4e8a51 100644 --- a/docs/examples/carousel/index.html +++ b/docs/examples/carousel/index.html @@ -98,19 +98,19 @@
-
+
Generic placeholder image

Heading

Donec sed odio dui. Etiam porta sem malesuada magna mollis euismod. Nullam id dolor id nibh ultricies vehicula ut id elit. Morbi leo risus, porta ac consectetur ac, vestibulum at eros. Praesent commodo cursus magna.

View details »

-
+
Generic placeholder image

Heading

Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit. Cras mattis consectetur purus sit amet fermentum. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh.

View details »

-
+
Generic placeholder image

Heading

Donec sed odio dui. Cras justo odio, dapibus ac facilisis in, egestas eget quam. Vestibulum id ligula porta felis euismod semper. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus.

@@ -124,11 +124,11 @@
-
+

First featurette heading. It'll blow your mind.

Donec ullamcorper nulla non metus auctor fringilla. Vestibulum id ligula porta felis euismod semper. Praesent commodo cursus magna, vel scelerisque nisl consectetur. Fusce dapibus, tellus ac cursus commodo.

-
+
Generic placeholder image
@@ -136,11 +136,11 @@
-
+

Oh yeah, it's that good. See for yourself.

Donec ullamcorper nulla non metus auctor fringilla. Vestibulum id ligula porta felis euismod semper. Praesent commodo cursus magna, vel scelerisque nisl consectetur. Fusce dapibus, tellus ac cursus commodo.

-
+
Generic placeholder image
@@ -148,11 +148,11 @@
-
+

And lastly, this one. Checkmate.

Donec ullamcorper nulla non metus auctor fringilla. Vestibulum id ligula porta felis euismod semper. Praesent commodo cursus magna, vel scelerisque nisl consectetur. Fusce dapibus, tellus ac cursus commodo.

-
+
Generic placeholder image
diff --git a/docs/examples/dashboard/index.html b/docs/examples/dashboard/index.html index a956bd4113..65cc380cbc 100644 --- a/docs/examples/dashboard/index.html +++ b/docs/examples/dashboard/index.html @@ -43,7 +43,7 @@
-
+
-
+

Dashboard

-
+
Generic placeholder thumbnail

Label

Something else
-
+
Generic placeholder thumbnail

Label

Something else
-
+
Generic placeholder thumbnail

Label

Something else
-
+
Generic placeholder thumbnail

Label

Something else diff --git a/docs/examples/grid/index.html b/docs/examples/grid/index.html index c9bcf8b93f..9e831115b4 100644 --- a/docs/examples/grid/index.html +++ b/docs/examples/grid/index.html @@ -30,56 +30,56 @@

There are five tiers to the Bootstrap grid system, one for each range of devices we support. Each tier starts at a minimum viewport size and automatically applies to the larger devices unless overridden.

-
.col .col-xs-4
-
.col .col-xs-4
-
.col .col-xs-4
+
.col-xs-4
+
.col-xs-4
+
.col-xs-4
-
.col .col-sm-4
-
.col .col-sm-4
-
.col .col-sm-4
+
.col-sm-4
+
.col-sm-4
+
.col-sm-4
-
.col .col-md-4
-
.col .col-md-4
-
.col .col-md-4
+
.col-md-4
+
.col-md-4
+
.col-md-4
-
.col .col-lg-4
-
.col .col-lg-4
-
.col .col-lg-4
+
.col-lg-4
+
.col-lg-4
+
.col-lg-4
-
.col .col-xl-4
-
.col .col-xl-4
-
.col .col-xl-4
+
.col-xl-4
+
.col-xl-4
+
.col-xl-4

Three equal columns

Get three equal-width columns starting at desktops and scaling to large desktops. On mobile devices, tablets and below, the columns will automatically stack.

-
.col .col-md-4
-
.col .col-md-4
-
.col .col-md-4
+
.col-md-4
+
.col-md-4
+
.col-md-4

Three unequal columns

Get three columns starting at desktops and scaling to large desktops of various widths. Remember, grid columns should add up to twelve for a single horizontal block. More than that, and columns start stacking no matter the viewport.

-
.col .col-md-3
-
.col .col-md-6
-
.col .col-md-3
+
.col-md-3
+
.col-md-6
+
.col-md-3

Two columns

Get two columns starting at desktops and scaling to large desktops.

-
.col .col-md-8
-
.col .col-md-4
+
.col-md-8
+
.col-md-4

Full width, single column

@@ -91,14 +91,14 @@

Per the documentation, nesting is easy—just put a row of columns within an existing column. This gives you two columns starting at desktops and scaling to large desktops, with another two (equal widths) within the larger column.

At mobile device sizes, tablets and down, these columns and their nested columns will stack.

-
+
.col-md-8
-
.col .col-md-6
-
.col .col-md-6
+
.col-md-6
+
.col-md-6
-
.col .col-md-4
+
.col-md-4
@@ -107,17 +107,17 @@

The Bootstrap v4 grid system has five tiers of classes: xs (extra small), sm (small), md (medium), lg (large), and xl (extra large). You can use nearly any combination of these classes to create more dynamic and flexible layouts.

Each tier of classes scales up, meaning if you plan on setting the same widths for xs and sm, you only need to specify xs.

-
.col .col-xs-12 .col-md-8
-
.col .col-xs-6 .col-md-4
+
.col-xs-12 .col-md-8
+
.col-xs-6 .col-md-4
-
.col .col-xs-6 .col-md-4
-
.col .col-xs-6 .col-md-4
-
.col .col-xs-6 .col-md-4
+
.col-xs-6 .col-md-4
+
.col-xs-6 .col-md-4
+
.col-xs-6 .col-md-4
-
.col .col-xs-6
-
.col .col-xs-6
+
.col-xs-6
+
.col-xs-6
@@ -125,13 +125,13 @@

Mixed: mobile, tablet, and desktop

-
.col .col-xs-12 .col-sm-6 .col-lg-8
-
.col .col-xs-6 .col-lg-4
+
.col-xs-12 .col-sm-6 .col-lg-8
+
.col-xs-6 .col-lg-4
-
.col .col-xs-6 .col-sm-4
-
.col .col-xs-6 .col-sm-4
-
.col .col-xs-6 .col-sm-4
+
.col-xs-6 .col-sm-4
+
.col-xs-6 .col-sm-4
+
.col-xs-6 .col-sm-4
@@ -139,18 +139,18 @@

Column clearing

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

-
+
.col-xs-6 .col-sm-3
Resize your viewport or check it out on your phone for an example.
-
.col .col-xs-6 .col-sm-3
+
.col-xs-6 .col-sm-3
-
.col .col-xs-6 .col-sm-3
-
.col .col-xs-6 .col-sm-3
+
.col-xs-6 .col-sm-3
+
.col-xs-6 .col-sm-3
@@ -158,12 +158,12 @@

Offset, push, and pull resets

Reset offsets, pushes, and pulls at specific breakpoints.

-
.col .col-sm-5 .col-md-6
-
.col .col-sm-5 .col-sm-offset-2 .col-md-6 .col-md-offset-0
+
.col-sm-5 .col-md-6
+
.col-sm-5 .col-sm-offset-2 .col-md-6 .col-md-offset-0
-
.col .col-sm-6 .col-md-5 .col-lg-6
-
.col .col-sm-6 .col-md-5 .col-md-offset-2 .col-lg-6 .col-lg-offset-0
+
.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
diff --git a/docs/examples/jumbotron/index.html b/docs/examples/jumbotron/index.html index 1eb5c32864..3e362fb46a 100644 --- a/docs/examples/jumbotron/index.html +++ b/docs/examples/jumbotron/index.html @@ -47,17 +47,17 @@
-
+

Heading

Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui.

View details »

-
+

Heading

Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui.

View details »

-
+

Heading

Donec sed odio dui. Cras justo odio, dapibus ac facilisis in, egestas eget quam. Vestibulum id ligula porta felis euismod semper. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus.

View details »

diff --git a/docs/examples/justified-nav/index.html b/docs/examples/justified-nav/index.html index 08e4808e7c..a757a5c9a8 100644 --- a/docs/examples/justified-nav/index.html +++ b/docs/examples/justified-nav/index.html @@ -47,18 +47,18 @@
-
+

Safari bug warning!

As of v9.0, Safari exhibits a bug in which resizing your browser horizontally causes rendering errors in the justified nav that are cleared upon refreshing.

Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui.

View details »

-
+

Heading

Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui.

View details »

-
+

Heading

Donec sed odio dui. Cras justo odio, dapibus ac facilisis in, egestas eget quam. Vestibulum id ligula porta felis euismod semper. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa.

View details »

diff --git a/docs/examples/narrow-jumbotron/index.html b/docs/examples/narrow-jumbotron/index.html index 4d7c821ef7..fc55d06488 100644 --- a/docs/examples/narrow-jumbotron/index.html +++ b/docs/examples/narrow-jumbotron/index.html @@ -45,7 +45,7 @@
-
+

Subheading

Donec id elit non mi porta gravida at eget metus. Maecenas faucibus mollis interdum.

@@ -56,7 +56,7 @@

Maecenas sed diam eget risus varius blandit sit amet non magna.

-
+

Subheading

Donec id elit non mi porta gravida at eget metus. Maecenas faucibus mollis interdum.

diff --git a/docs/examples/offcanvas/index.html b/docs/examples/offcanvas/index.html index 262df60aae..16a70b3799 100644 --- a/docs/examples/offcanvas/index.html +++ b/docs/examples/offcanvas/index.html @@ -34,7 +34,7 @@
-
+

@@ -43,32 +43,32 @@

This is an example to show the potential of an offcanvas layout pattern in Bootstrap. Try some responsive-range viewport sizes to see it in action.

-
+

Heading

Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui.

View details »

-
+

Heading

Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui.

View details »

-
+

Heading

Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui.

View details »

-
+

Heading

Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui.

View details »

-
+

Heading

Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui.

View details »

-
+

Heading

Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui.

View details »

@@ -76,7 +76,7 @@
-