Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixes #10116: Deprecate container-{device} vars #10125

Merged
merged 2 commits into from
Sep 1, 2013
Merged

Fixes #10116: Deprecate container-{device} vars #10125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5491d53
Deprecate container-{device} vars for container-{size} classes; updat…
mdo Aug 24, 2013
f29ec45
Merge branch 'master' into deprecate_screen_containers
mdo Sep 1, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions customize.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -488,19 +488,19 @@ <h3>Container sizes</h3>
<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>
Expand Down
8 changes: 4 additions & 4 deletions less/grid.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@

@media (min-width: @screen-sm) {
.container {
max-width: @container-tablet;
max-width: @container-sm;
}

.col-sm-1,
Expand Down Expand Up @@ -194,7 +194,7 @@

@media (min-width: @screen-md) {
.container {
max-width: @container-desktop;
max-width: @container-md;
}
.col-md-1,
.col-md-2,
Expand Down Expand Up @@ -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,
Expand Down
9 changes: 6 additions & 3 deletions less/variables.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -619,10 +619,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;