diff options
| author | Jacob Thornton <[email protected]> | 2012-04-18 13:15:58 -0700 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2012-04-18 13:15:58 -0700 |
| commit | b627898919bcd17cafe5b1cae69c555ebb9a769e (patch) | |
| tree | 202e392f7e650ffc276899513f4d16c1d076c192 /docs | |
| parent | 8f98c4fbf6085e613314892de5da871dce862b34 (diff) | |
| parent | 47b6e6bd80040cdaa50c27cb7eb11881df679eee (diff) | |
| download | bootstrap-b627898919bcd17cafe5b1cae69c555ebb9a769e.tar.xz bootstrap-b627898919bcd17cafe5b1cae69c555ebb9a769e.zip | |
Merge branch '2.0.3-wip' of https://github.com/twitter/bootstrap into 2.0.3-wip
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/assets/css/bootstrap.css | 2 | ||||
| -rw-r--r-- | docs/scaffolding.html | 6 | ||||
| -rw-r--r-- | docs/templates/pages/scaffolding.mustache | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 00485499f..43bba2bee 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -3740,7 +3740,7 @@ a.thumbnail:hover { font-weight: bold; line-height: 14px; color: #ffffff; - vertical-align: middle; + vertical-align: baseline; white-space: nowrap; text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); background-color: #999999; diff --git a/docs/scaffolding.html b/docs/scaffolding.html index 20a9f5c73..caffa6af6 100644 --- a/docs/scaffolding.html +++ b/docs/scaffolding.html @@ -533,13 +533,13 @@ @media (max-width: 480px) { ... } // Landscape phone to portrait tablet - @media (max-width: 768px) { ... } + @media (max-width: 767px) { ... } // Portrait tablet to landscape and desktop - @media (min-width: 768px) and (max-width: 980px) { ... } + @media (min-width: 768px) and (max-width: 979px) { ... } // Large desktop - @media (min-width: 1200px) { .. } + @media (min-width: 1200px) { ... } </pre> </div><!-- /.span --> </div><!-- /.row --> diff --git a/docs/templates/pages/scaffolding.mustache b/docs/templates/pages/scaffolding.mustache index 40b264d03..13c777a26 100644 --- a/docs/templates/pages/scaffolding.mustache +++ b/docs/templates/pages/scaffolding.mustache @@ -456,13 +456,13 @@ @media (max-width: 480px) { ... } // {{_i}}Landscape phone to portrait tablet{{/i}} - @media (max-width: 768px) { ... } + @media (max-width: 767px) { ... } // {{_i}}Portrait tablet to landscape and desktop{{/i}} - @media (min-width: 768px) and (max-width: 980px) { ... } + @media (min-width: 768px) and (max-width: 979px) { ... } // {{_i}}Large desktop{{/i}} - @media (min-width: 1200px) { .. } + @media (min-width: 1200px) { ... } </pre> </div><!-- /.span --> </div><!-- /.row --> |