diff options
| author | Jacob Thornton <[email protected]> | 2013-08-07 23:10:11 -0700 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2013-08-07 23:10:11 -0700 |
| commit | 89b69ed77035eeb9c0034534d75fdb2062f10d47 (patch) | |
| tree | 99b1f65ee730de94e64b4992e5131f0432743b1e /less/variables.less | |
| parent | b35b65d0b3689f7999be998411e632046548af6e (diff) | |
| parent | f3104a3e3b04c2817094ef8ebd351833a4ade420 (diff) | |
| download | bootstrap-89b69ed77035eeb9c0034534d75fdb2062f10d47.tar.xz bootstrap-89b69ed77035eeb9c0034534d75fdb2062f10d47.zip | |
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
Conflicts:
_layouts/customize.html
Diffstat (limited to 'less/variables.less')
| -rw-r--r-- | less/variables.less | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/less/variables.less b/less/variables.less index 27b13c3ab..3a9430e2e 100644 --- a/less/variables.less +++ b/less/variables.less @@ -197,14 +197,16 @@ @screen-medium: 992px; @screen-desktop: @screen-medium; -// So media queries don't overlap when required, provide a maximum -@screen-small-max: (@screen-medium - 1); -@screen-tablet-max: @screen-small-max; - // Large screen / wide desktop @screen-large: 1200px; @screen-large-desktop: @screen-large; +// So media queries don't overlap when required, provide a maximum +@screen-small-max: (@screen-medium - 1); +@screen-tablet-max: (@screen-desktop - 1); +@screen-desktop-max: (@screen-large-desktop - 1); + + // Grid system // -------------------------------------------------- @@ -356,7 +358,7 @@ // ------------------------- @tooltip-max-width: 200px; @tooltip-color: #fff; -@tooltip-bg: rgba(0,0,0,.9); +@tooltip-bg: #000; @tooltip-arrow-width: 5px; @tooltip-arrow-color: @tooltip-bg; |