diff options
| author | Mark Otto <[email protected]> | 2013-09-01 11:05:14 +0200 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-09-01 11:05:14 +0200 |
| commit | 25cc04c5abd07928b6df34aa582da85ccd49a526 (patch) | |
| tree | 53adce4e3602163accc070a5214586f428a1168b | |
| parent | d28abc4bf15ab00c7c7587f2fd520218ed6283f1 (diff) | |
| parent | f29ec45715d33c7667682517bbab4ec285716bde (diff) | |
| download | bootstrap-25cc04c5abd07928b6df34aa582da85ccd49a526.tar.xz bootstrap-25cc04c5abd07928b6df34aa582da85ccd49a526.zip | |
Merge branch 'deprecate_screen_containers'
| -rw-r--r-- | customize.html | 12 | ||||
| -rw-r--r-- | less/grid.less | 8 | ||||
| -rw-r--r-- | less/variables.less | 9 |
3 files changed, 16 insertions, 13 deletions
diff --git a/customize.html b/customize.html index aeccf2cb3..bbdaa3f07 100644 --- a/customize.html +++ b/customize.html @@ -487,19 +487,19 @@ base_url: "../" <p>Define the maximum width of <code>.container</code> for different screen sizes.</p> <div class="row"> <div class="col-xs-6 col-sm-4"> - <label>@container-tablet</label> - <input type="text" class="form-control" placeholder="728px" data-var="@container-tablet"> + <label>@container-sm</label> + <input type="text" class="form-control" placeholder="728px" data-var="@container-sm"> <p class="help-block">For <code>@screen-sm-min</code> and up.</p> </div> <div class="col-xs-6 col-sm-4"> - <label>@container-desktop</label> - <input type="text" class="form-control" placeholder="940px" data-var="@container-desktop"> + <label>@container-md</label> + <input type="text" class="form-control" placeholder="940px" data-var="@container-md"> <p class="help-block">For <code>@screen-md-min</code> and up.</p> </div> <div class="clearfix visible-xs"></div> <div class="col-xs-6 col-sm-4"> - <label>@container-lg-desktop</label> - <input type="text" class="form-control" placeholder="1170px" data-var="@container-lg-desktop"> + <label>@container-lg</label> + <input type="text" class="form-control" placeholder="1170px" data-var="@container-lg"> <p class="help-block">For <code>@screen-lg-min</code> and up.</p> </div> </div> diff --git a/less/grid.less b/less/grid.less index d3a3cf6bc..ef6f1ebda 100644 --- a/less/grid.less +++ b/less/grid.less @@ -116,7 +116,7 @@ @media (min-width: @screen-sm) { .container { - max-width: @container-tablet; + max-width: @container-sm; } .col-sm-1, @@ -194,7 +194,7 @@ @media (min-width: @screen-md) { .container { - max-width: @container-desktop; + max-width: @container-md; } .col-md-1, .col-md-2, @@ -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-lg-desktop) { +@media (min-width: @screen-lg-min) { .container { - max-width: @container-lg-desktop; + max-width: @container-lg; } .col-lg-1, diff --git a/less/variables.less b/less/variables.less index 9963e67b5..022f5ff87 100644 --- a/less/variables.less +++ b/less/variables.less @@ -622,10 +622,13 @@ // -------------------------------------------------- // Small screen / tablet -@container-tablet: ((720px + @grid-gutter-width)); +@container-sm: ((720px + @grid-gutter-width)); +@container-tablet: @container-sm; // Medium screen / desktop -@container-desktop: ((940px + @grid-gutter-width)); +@container-md: ((940px + @grid-gutter-width)); +@container-desktop: @container-md; // Large screen / wide desktop -@container-lg-desktop: ((1140px + @grid-gutter-width)); +@container-lg: ((1140px + @grid-gutter-width)); +@container-large-desktop: @container-lg; |