diff options
| author | Mark Otto <[email protected]> | 2012-02-22 08:12:51 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-02-22 08:12:51 -0800 |
| commit | 4410ede8ed976f449d9b1735652e081ed863a131 (patch) | |
| tree | 0410d145f90d0084ff0a28e4f5d0cfec89b25257 /less/responsive.less | |
| parent | 92a54a7b723065ad6c64520b2a75b410682fc755 (diff) | |
| parent | f3b6cf1d6d65ccc640152aa4edb88cbea05a8b45 (diff) | |
| download | bootstrap-4410ede8ed976f449d9b1735652e081ed863a131.tar.xz bootstrap-4410ede8ed976f449d9b1735652e081ed863a131.zip | |
Merge branch '2.0.2-wip' of github.com:twitter/bootstrap into 2.0.2-wip
Conflicts:
docs/assets/bootstrap.zip
Diffstat (limited to 'less/responsive.less')
| -rw-r--r-- | less/responsive.less | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/less/responsive.less b/less/responsive.less index aacefe6cc..7fa62cad9 100644 --- a/less/responsive.less +++ b/less/responsive.less @@ -188,13 +188,13 @@ @media (min-width: 768px) and (max-width: 979px) { // Fixed grid - #gridSystem > .generate(@gridColumns, 42px, 20px); + #grid > .core(42px, 20px); // Fluid grid - #fluidGridSystem > .generate(@gridColumns, 5.801104972%, 2.762430939%); + #grid > .fluid(5.801104972%, 2.762430939%); // Input grid - #inputGridSystem > .generate(@gridColumns, 42px, 20px); + #grid > .input(42px, 20px); } @@ -340,13 +340,13 @@ @media (min-width: 1200px) { // Fixed grid - #gridSystem > .generate(@gridColumns, 70px, 30px); + #grid > .core(70px, 30px); // Fluid grid - #fluidGridSystem > .generate(@gridColumns, 5.982905983%, 2.564102564%); + #grid > .fluid(5.982905983%, 2.564102564%); // Input grid - #inputGridSystem > .generate(@gridColumns, 70px, 30px); + #grid > .input(70px, 30px); // Thumbnails .thumbnails { |