From ea01e8bbc4fd42ac1e77b5af197b3b1198c50acc Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 26 Feb 2013 00:49:21 -0800 Subject: nuke remaining less/tests/ files and move grid over to examples dir --- docs/examples/grid.html | 64 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) create mode 100644 docs/examples/grid.html (limited to 'docs/examples/grid.html') diff --git a/docs/examples/grid.html b/docs/examples/grid.html new file mode 100644 index 000000000..4fc724a5a --- /dev/null +++ b/docs/examples/grid.html @@ -0,0 +1,64 @@ +--- +layout: example +title: Grid template +--- + + + + + +
+ +
+

Grids

+
+ +

Default grid columns

+
+
+
1
+
1
+
1
+
1
+
1
+
1
+
1
+
1
+
1
+
1
+
1
+
1
+
+
+
4
+
4
+
4
+
+
+
6
+
6
+
+
+
12
+
+
+ +
-- cgit v1.2.3 From d5303906bd784619d8f2fa5a8244836056e5139d Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 26 Mar 2013 17:17:39 -0700 Subject: Remove grid example; update grid classes in examples --- docs/examples/grid.html | 64 ------------------------------------------------- 1 file changed, 64 deletions(-) delete mode 100644 docs/examples/grid.html (limited to 'docs/examples/grid.html') diff --git a/docs/examples/grid.html b/docs/examples/grid.html deleted file mode 100644 index 4fc724a5a..000000000 --- a/docs/examples/grid.html +++ /dev/null @@ -1,64 +0,0 @@ ---- -layout: example -title: Grid template ---- - - - - - -
- -
-

Grids

-
- -

Default grid columns

-
-
-
1
-
1
-
1
-
1
-
1
-
1
-
1
-
1
-
1
-
1
-
1
-
1
-
-
-
4
-
4
-
4
-
-
-
6
-
6
-
-
-
12
-
-
- -
-- cgit v1.2.3 From eac987c0d2bdb93ea4c916d52f38655bcc5e1255 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 1 Apr 2013 12:55:48 -0700 Subject: only negative indent nested grid rows; add new grid example --- docs/examples/grid.html | 56 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 docs/examples/grid.html (limited to 'docs/examples/grid.html') diff --git a/docs/examples/grid.html b/docs/examples/grid.html new file mode 100644 index 000000000..f2028b8bf --- /dev/null +++ b/docs/examples/grid.html @@ -0,0 +1,56 @@ +--- +layout: example +title: Grid template +--- + + + + + +
+ +

Bootstrap grids

+

Basic grid layouts to get you familiar with building within the Bootstrap grid system.

+ +

Three equal columns

+
+
.col-span-4
+
.col-span-4
+
.col-span-4
+
+ +

Three unequal columns

+
+
.col-span-3
+
.col-span-6
+
.col-span-3
+
+ +

Two columns

+
+
.col-span-8
+
.col-span-4
+
+ +

Full width, single column

+

No grid classes are necessary for full-width elements.

+ +
-- cgit v1.2.3 From 62afdd01763466e413fbe67c7622e08a16fa30aa Mon Sep 17 00:00:00 2001 From: Robert Burns Date: Sun, 28 Apr 2013 22:22:33 -0400 Subject: Update examples after grid changes --- docs/examples/grid.html | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'docs/examples/grid.html') diff --git a/docs/examples/grid.html b/docs/examples/grid.html index f2028b8bf..580f69cbf 100644 --- a/docs/examples/grid.html +++ b/docs/examples/grid.html @@ -16,7 +16,7 @@ title: Grid template margin-left: -15px; margin-right: -15px; } - [class*="col-span-"] { + [class*="col-lg-"] { padding-top: 15px; padding-bottom: 15px; background-color: #f5f5f5; @@ -32,22 +32,22 @@ title: Grid template

Three equal columns

-
.col-span-4
-
.col-span-4
-
.col-span-4
+
.col .col-lg-4
+
.col .col-lg-4
+
.col .col-lg-4

Three unequal columns

-
.col-span-3
-
.col-span-6
-
.col-span-3
+
.col .col-lg-3
+
.col .col-lg-6
+
.col .col-lg-3

Two columns

-
.col-span-8
-
.col-span-4
+
.col .col-lg-8
+
.col .col-lg-4

Full width, single column

-- cgit v1.2.3 From 5fbb9e9f5d241744dc2e2cbd1bfd8676c566f22d Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 16 May 2013 21:03:29 -0700 Subject: More row change ups: * No more negative side margins * However, keep the negative margin for nested rows --- docs/examples/grid.html | 2 -- 1 file changed, 2 deletions(-) (limited to 'docs/examples/grid.html') diff --git a/docs/examples/grid.html b/docs/examples/grid.html index 580f69cbf..eea2ac0cf 100644 --- a/docs/examples/grid.html +++ b/docs/examples/grid.html @@ -13,8 +13,6 @@ title: Grid template .row { margin-bottom: 20px; - margin-left: -15px; - margin-right: -15px; } [class*="col-lg-"] { padding-top: 15px; -- cgit v1.2.3 From 5f7352a6fe5f7a7eef4dce64184f55d1fec2676b Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 16 May 2013 22:11:31 -0700 Subject: Better grid template; link color change in docs navbar --- docs/examples/grid.html | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) (limited to 'docs/examples/grid.html') diff --git a/docs/examples/grid.html b/docs/examples/grid.html index eea2ac0cf..d14602e4e 100644 --- a/docs/examples/grid.html +++ b/docs/examples/grid.html @@ -11,9 +11,16 @@ title: Grid template padding-right: 15px; } + h4 { + margin-top: 25px; + } .row { margin-bottom: 20px; } + .row .row { + margin-top: 10px; + margin-bottom: 0; + } [class*="col-lg-"] { padding-top: 15px; padding-bottom: 15px; @@ -49,6 +56,19 @@ title: Grid template

Full width, single column

-

No grid classes are necessary for full-width elements.

+

No grid classes are necessary for full-width elements.

+ +

Two columns with two nested columns

+
+
+ .col .col-lg-8 +
+
.col .col-lg-6
+
.col .col-lg-6
+
+
+
.col .col-lg-4
+
+ -- cgit v1.2.3 From 245ebda651fcdbc9687c1a436e8bbe3916354da6 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 3 Jun 2013 21:57:51 -0700 Subject: nuke the .col --- docs/examples/grid.html | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'docs/examples/grid.html') diff --git a/docs/examples/grid.html b/docs/examples/grid.html index d14602e4e..98dd760da 100644 --- a/docs/examples/grid.html +++ b/docs/examples/grid.html @@ -37,22 +37,22 @@ title: Grid template

Three equal columns

-
.col .col-lg-4
-
.col .col-lg-4
-
.col .col-lg-4
+
.col-lg-4
+
.col-lg-4
+
.col-lg-4

Three unequal columns

-
.col .col-lg-3
-
.col .col-lg-6
-
.col .col-lg-3
+
.col-lg-3
+
.col-lg-6
+
.col-lg-3

Two columns

-
.col .col-lg-8
-
.col .col-lg-4
+
.col-lg-8
+
.col-lg-4

Full width, single column

@@ -60,14 +60,14 @@ title: Grid template

Two columns with two nested columns

-
- .col .col-lg-8 +
+ .col-lg-8
-
.col .col-lg-6
-
.col .col-lg-6
+
.col-lg-6
+
.col-lg-6
-
.col .col-lg-4
+
.col-lg-4
-- cgit v1.2.3 From 0a18d33d2c1600c9d5133127dac4db2f690df71a Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 9 Jun 2013 23:43:43 -0700 Subject: Redo grid documentation * Update example sections to include basic, mobile-desktop, and mobile-tablet-desktop implementations * Add more examples to the grid example page * Red columns instead of gray for more Bootstrapy aesthetic --- docs/examples/grid.html | 34 ++++++++++++++++++++++++++++++++-- 1 file changed, 32 insertions(+), 2 deletions(-) (limited to 'docs/examples/grid.html') diff --git a/docs/examples/grid.html b/docs/examples/grid.html index 98dd760da..14e8ecdf6 100644 --- a/docs/examples/grid.html +++ b/docs/examples/grid.html @@ -24,8 +24,8 @@ title: Grid template [class*="col-lg-"] { padding-top: 15px; padding-bottom: 15px; - background-color: #f5f5f5; - border: 1px solid #e5e5e5; + background-color: rgba(185,74,72,.15); + border: 1px solid rgba(185,74,72,.2); } @@ -70,5 +70,35 @@ title: Grid template
.col-lg-4
+

Mixed: mobile and desktop

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

Mixed: mobile, tablet, and desktop

+
+
.col-12 .col-lg-8
+
.col-6 .col-lg-4
+
+
+
.col-6 .col-lg-4
+
.col-6 .col-lg-4
+
.col-6 .col-lg-4
+
+
+
.col-6 .col-lg-6
+
.col-6 .col-lg-6
+
+ -- cgit v1.2.3