From 283c86db38df3c9273749cdd0c401e06a4e66c37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zlatan=20Vasovi=C4=87?= Date: Sun, 17 Nov 2013 21:15:25 +0100 Subject: There are xs-offsets, -pushes and -pulls! --- less/grid.less | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'less/grid.less') diff --git a/less/grid.less b/less/grid.less index 67e78f760..8f8794339 100644 --- a/less/grid.less +++ b/less/grid.less @@ -18,8 +18,8 @@ // Extra small grid // -// Grid classes for extra small devices like smartphones. No offset, push, or -// pull classes are present here due to the size of the target. +// Columns, offsets, pushes, and pulls for extra small devices like +// smartphones. // // Note that `.col-xs-12` doesn't get floated on purpose--there's no need since // it's full-width. -- cgit v1.2.3 From 9d939080e6536277ec47d19e113bff7376489ff9 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 28 Nov 2013 14:22:31 -0800 Subject: Fixes #10483 and #10357: Make .container mixin-friendly by moving the width declarations within one class --- less/grid.less | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) (limited to 'less/grid.less') diff --git a/less/grid.less b/less/grid.less index 67e78f760..329f68bd3 100644 --- a/less/grid.less +++ b/less/grid.less @@ -5,6 +5,16 @@ // Set the container width, and override it for fixed navbars in media queries .container { .container-fixed(); + + @media (min-width: @screen-sm) { + width: @container-sm; + } + @media (min-width: @screen-md) { + width: @container-md; + } + @media (min-width: @screen-lg-min) { + width: @container-lg; + } } // mobile first defaults @@ -40,10 +50,6 @@ // it's full-width. @media (min-width: @screen-sm-min) { - .container { - width: @container-sm; - } - .make-grid-columns-float(sm); .make-grid(@grid-columns, sm, width); .make-grid(@grid-columns, sm, pull); @@ -60,10 +66,6 @@ // it's full-width. @media (min-width: @screen-md-min) { - .container { - width: @container-md; - } - .make-grid-columns-float(md); .make-grid(@grid-columns, md, width); .make-grid(@grid-columns, md, pull); @@ -80,10 +82,6 @@ // it's full-width. @media (min-width: @screen-lg-min) { - .container { - width: @container-lg; - } - .make-grid-columns-float(lg); .make-grid(@grid-columns, lg, width); .make-grid(@grid-columns, lg, pull); -- cgit v1.2.3 From 702ad4c3025c8db0ec482e5eccd339cf1e6c2a5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zlatan=20Vasovi=C4=87?= Date: Fri, 29 Nov 2013 11:37:06 +0100 Subject: Remove redundant comments --- less/grid.less | 12 ------------ 1 file changed, 12 deletions(-) (limited to 'less/grid.less') diff --git a/less/grid.less b/less/grid.less index 329f68bd3..e1f134e6d 100644 --- a/less/grid.less +++ b/less/grid.less @@ -30,9 +30,6 @@ // // Grid classes for extra small devices like smartphones. No offset, push, or // pull classes are present here due to the size of the target. -// -// Note that `.col-xs-12` doesn't get floated on purpose--there's no need since -// it's full-width. .make-grid-columns-float(xs); .make-grid(@grid-columns, xs, width); @@ -45,9 +42,6 @@ // // Columns, offsets, pushes, and pulls for the small device range, from phones // to tablets. -// -// Note that `.col-sm-12` doesn't get floated on purpose--there's no need since -// it's full-width. @media (min-width: @screen-sm-min) { .make-grid-columns-float(sm); @@ -61,9 +55,6 @@ // Medium grid // // Columns, offsets, pushes, and pulls for the desktop device range. -// -// Note that `.col-md-12` doesn't get floated on purpose--there's no need since -// it's full-width. @media (min-width: @screen-md-min) { .make-grid-columns-float(md); @@ -77,9 +68,6 @@ // Large grid // // Columns, offsets, pushes, and pulls for the large desktop device range. -// -// Note that `.col-lg-12` doesn't get floated on purpose--there's no need since -// it's full-width. @media (min-width: @screen-lg-min) { .make-grid-columns-float(lg); -- cgit v1.2.3