diff options
| author | Ivan Khalopik <[email protected]> | 2013-06-10 10:31:51 +0300 |
|---|---|---|
| committer | Ivan Khalopik <[email protected]> | 2013-06-10 10:31:51 +0300 |
| commit | e138b0df3a1bcd536cc312d7c4714ff5bc9acd2b (patch) | |
| tree | 2d6f41184d19466d6f9fa016ba521260413435cb /less/variables.less | |
| parent | 3285f4c3062f4a56eaed2461a3128a2e6a3ba9cc (diff) | |
| parent | d74a9634b0cb21a712f5e805c7a21132dc9bee5e (diff) | |
| download | bootstrap-e138b0df3a1bcd536cc312d7c4714ff5bc9acd2b.tar.xz bootstrap-e138b0df3a1bcd536cc312d7c4714ff5bc9acd2b.zip | |
Merge remote-tracking branch 'bootstrap/3.0.0-wip' into 3.0.0-wip
Diffstat (limited to 'less/variables.less')
| -rw-r--r-- | less/variables.less | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/less/variables.less b/less/variables.less index 9cd8f830b..f9c32c148 100644 --- a/less/variables.less +++ b/less/variables.less @@ -131,8 +131,6 @@ @input-height-large: (@line-height-computed + (@padding-large-vertical * 2)); @input-height-small: (@line-height-computed + (@padding-small-vertical * 2)); -@form-actions-bg: #f5f5f5; - // Dropdowns // ------------------------- @@ -405,6 +403,19 @@ @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 // -------------------------------------------------- |