diff options
| author | Mark Otto <[email protected]> | 2013-08-17 22:39:07 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-08-17 22:39:07 -0700 |
| commit | 18766db63423e9151d1be4de061016b7a53ff8a1 (patch) | |
| tree | 07c1170429e6e22caba90d72948460f379d989e3 /less/grid.less | |
| parent | 5e31478a91e62fc022ba0141acf27937c9dd7719 (diff) | |
| parent | 04a73ebe42b8beb9567220fe31cc11057badf40f (diff) | |
| download | bootstrap-18766db63423e9151d1be4de061016b7a53ff8a1.tar.xz bootstrap-18766db63423e9151d1be4de061016b7a53ff8a1.zip | |
Merge branch '3.0.0-wip' into bs3_homepage
Conflicts:
dist/css/bootstrap.min.css
Diffstat (limited to 'less/grid.less')
| -rw-r--r-- | less/grid.less | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/less/grid.less b/less/grid.less index e3684e5ae..c77f455f3 100644 --- a/less/grid.less +++ b/less/grid.less @@ -272,9 +272,9 @@ // Note that `.col-lg-12` doesn't get floated on purpose—there's no need since // it's full-width. -@media (min-width: @screen-large-desktop) { +@media (min-width: @screen-lg-desktop) { .container { - max-width: @container-large-desktop; + max-width: @container-lg-desktop; } .col-lg-1, |