Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/twbs/bootstrap.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <markotto@twitter.com>2012-09-01 10:12:02 +0400
committerMark Otto <markotto@twitter.com>2012-09-01 10:12:02 +0400
commit00d6f26270485cde0fb8474b76396eb81cd97eff (patch)
treef0a66a0044bace1a4616a2fb7a8711a4cf19b565 /docs/scaffolding.html
parent0f85e8b7f820a83559870ce0c00d5ea884475fdc (diff)
fixes #4896: reflect media query order in docs
Diffstat (limited to 'docs/scaffolding.html')
-rw-r--r--docs/scaffolding.html42
1 files changed, 21 insertions, 21 deletions
diff --git a/docs/scaffolding.html b/docs/scaffolding.html
index a78b1b5b47..d734ea5aed 100644
--- a/docs/scaffolding.html
+++ b/docs/scaffolding.html
@@ -413,14 +413,16 @@
</thead>
<tbody>
<tr>
- <td>Phones</td>
- <td>480px and below</td>
- <td class="muted" colspan="2">Fluid columns, no fixed widths</td>
+ <td>Large display</td>
+ <td>1200px and up</td>
+ <td>70px</td>
+ <td>30px</td>
</tr>
<tr>
- <td>Phones to tablets</td>
- <td>767px and below</td>
- <td class="muted" colspan="2">Fluid columns, no fixed widths</td>
+ <td>Default</td>
+ <td>980px and up</td>
+ <td>60px</td>
+ <td>20px</td>
</tr>
<tr>
<td>Portrait tablets</td>
@@ -429,31 +431,29 @@
<td>20px</td>
</tr>
<tr>
- <td>Default</td>
- <td>980px and up</td>
- <td>60px</td>
- <td>20px</td>
+ <td>Phones to tablets</td>
+ <td>767px and below</td>
+ <td class="muted" colspan="2">Fluid columns, no fixed widths</td>
</tr>
<tr>
- <td>Large display</td>
- <td>1200px and up</td>
- <td>70px</td>
- <td>30px</td>
+ <td>Phones</td>
+ <td>480px and below</td>
+ <td class="muted" colspan="2">Fluid columns, no fixed widths</td>
</tr>
</tbody>
</table>
<pre class="prettyprint linenums">
-/* Landscape phones and down */
-@media (max-width: 480px) { ... }
-
-/* Landscape phone to portrait tablet */
-@media (max-width: 767px) { ... }
+/* Large desktop */
+@media (min-width: 1200px) { ... }
/* Portrait tablet to landscape and desktop */
@media (min-width: 768px) and (max-width: 979px) { ... }
-/* Large desktop */
-@media (min-width: 1200px) { ... }
+/* Landscape phone to portrait tablet */
+@media (max-width: 767px) { ... }
+
+/* Landscape phones and down */
+@media (max-width: 480px) { ... }
</pre>