mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-05 16:42:29 +03:00
Code Activity

Merge branch 'deprecate_screen_containers'

Browse Source
This commit is contained in:
Mark Otto
2013-09-01 11:05:14 +02:00
parent d28abc4bf1 f29ec45715
commit 25cc04c5ab
3 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
less/grid.less
+4 -4
View File
@@ -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,
less/variables.less
+6 -3
View File
@@ -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;