mirror of
https://github.com/twbs/bootstrap.git
synced 2025-02-18 15:54:26 +01:00
Merge pull request #8006 from aristath/3.0.0-wip
using screen-size variables for grids
This commit is contained in:
commit
b62fa23d9a
@ -39,21 +39,21 @@
|
|||||||
// Responsive: Tablets and up
|
// Responsive: Tablets and up
|
||||||
@media screen and (min-width: @screen-tablet) {
|
@media screen and (min-width: @screen-tablet) {
|
||||||
.container {
|
.container {
|
||||||
max-width: 728px;
|
max-width: @container-tablet;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Responsive: Desktops and up
|
// Responsive: Desktops and up
|
||||||
@media screen and (min-width: @screen-desktop) {
|
@media screen and (min-width: @screen-desktop) {
|
||||||
.container {
|
.container {
|
||||||
max-width: 940px;
|
max-width: @container-desktop;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Responsive: Large desktops and up
|
// Responsive: Large desktops and up
|
||||||
@media screen and (min-width: @screen-large-desktop) {
|
@media screen and (min-width: @screen-large-desktop) {
|
||||||
.container {
|
.container {
|
||||||
max-width: 1170px;
|
max-width: @container-large-desktop;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -403,6 +403,19 @@
|
|||||||
@screen-large-desktop: @screen-large;
|
@screen-large-desktop: @screen-large;
|
||||||
|
|
||||||
|
|
||||||
|
// Container sizes
|
||||||
|
// --------------------------------------------------
|
||||||
|
|
||||||
|
// Small screen / tablet
|
||||||
|
@container-tablet: 728px;
|
||||||
|
|
||||||
|
// Medium screen / desktop
|
||||||
|
@container-desktop: 940px;
|
||||||
|
|
||||||
|
// Large screen / wide desktop
|
||||||
|
@container-large-desktop: 1170px;
|
||||||
|
|
||||||
|
|
||||||
// Grid system
|
// Grid system
|
||||||
// --------------------------------------------------
|
// --------------------------------------------------
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user