From 589f5bfd4ddeeb10cc3ae2b22d296349454582de Mon Sep 17 00:00:00 2001 From: Catouse Date: Tue, 16 Aug 2016 15:39:40 +0800 Subject: [PATCH] * add fixed width container. --- src/less/basic/grid.less | 22 ++++++++++++++++------ src/less/basic/mixins.less | 4 +++- src/less/basic/variables.less | 2 ++ 3 files changed, 21 insertions(+), 7 deletions(-) diff --git a/src/less/basic/grid.less b/src/less/basic/grid.less index 55be97124..fb07656a7 100644 --- a/src/less/basic/grid.less +++ b/src/less/basic/grid.less @@ -14,22 +14,32 @@ // ========== +// Common style of containers + +.container, +.container-fluid, +.container-fixed, +.container-fixed-md, +.container-fixed-sm, +.container-fixed-xs { + .make-container(); +} + // Responsive container .container { - .container-fixed(); - @media(min-width: @screen-tablet) { max-width: @container-tablet; } @media(min-width: @screen-desktop) { max-width: @container-desktop; } @media(min-width: @screen-lg-desktop) { max-width: @container-lg-desktop; } } -// Fluid container +// Fixed width container -.container-fluid { - .container-fixed(); -} +.container-fixed { width: @container-lg-desktop; } +.container-fixed-md { width: @container-desktop; } +.container-fixed-sm { width: @container-tablet; } +.container-fixed-xs { width: @container-phone; } // ROWS & COLUMNS diff --git a/src/less/basic/mixins.less b/src/less/basic/mixins.less index 60dcd55af..250ed2dd0 100644 --- a/src/less/basic/mixins.less +++ b/src/less/basic/mixins.less @@ -596,7 +596,7 @@ // Grid System // Centered container element -.container-fixed(@gutter: @grid-gutter-width) { +.make-container(@gutter: @grid-gutter-width) { margin-right: auto; margin-left: auto; padding-left: floor((@gutter / 2)); @@ -610,6 +610,8 @@ // More easily include all the states for responsive-utilities.less. .responsive-visibility() { display: block !important; + .inline& { display: inline !important; } + .inline-block& { display: inline-block !important; } tr& { display: table-row !important; } th&, td& { display: table-cell !important; } diff --git a/src/less/basic/variables.less b/src/less/basic/variables.less index 0896d0906..d939fac7b 100644 --- a/src/less/basic/variables.less +++ b/src/less/basic/variables.less @@ -105,6 +105,8 @@ // Point at which the navbar begins collapsing. @grid-float-breakpoint-max: (@grid-float-breakpoint - 1); +// Extra small screen / phone +@container-phone: ((420px + @grid-gutter-width)); // Small screen / tablet @container-tablet: ((720px + @grid-gutter-width)); // Medium screen / desktop -- GitLab