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/templates/pages
parent0f85e8b7f820a83559870ce0c00d5ea884475fdc (diff)
fixes #4896: reflect media query order in docs
Diffstat (limited to 'docs/templates/pages')
-rw-r--r--docs/templates/pages/scaffolding.mustache42
1 files changed, 21 insertions, 21 deletions
diff --git a/docs/templates/pages/scaffolding.mustache b/docs/templates/pages/scaffolding.mustache
index 3fb7841b13..f32581faa0 100644
--- a/docs/templates/pages/scaffolding.mustache
+++ b/docs/templates/pages/scaffolding.mustache
@@ -345,14 +345,16 @@
</thead>
<tbody>
<tr>
- <td>{{_i}}Phones{{/i}}</td>
- <td>480px and below</td>
- <td class="muted" colspan="2">{{_i}}Fluid columns, no fixed widths{{/i}}</td>
+ <td>{{_i}}Large display{{/i}}</td>
+ <td>1200px and up</td>
+ <td>70px</td>
+ <td>30px</td>
</tr>
<tr>
- <td>{{_i}}Phones to tablets{{/i}}</td>
- <td>767px and below</td>
- <td class="muted" colspan="2">{{_i}}Fluid columns, no fixed widths{{/i}}</td>
+ <td>{{_i}}Default{{/i}}</td>
+ <td>980px and up</td>
+ <td>60px</td>
+ <td>20px</td>
</tr>
<tr>
<td>{{_i}}Portrait tablets{{/i}}</td>
@@ -361,31 +363,29 @@
<td>20px</td>
</tr>
<tr>
- <td>{{_i}}Default{{/i}}</td>
- <td>980px and up</td>
- <td>60px</td>
- <td>20px</td>
+ <td>{{_i}}Phones to tablets{{/i}}</td>
+ <td>767px and below</td>
+ <td class="muted" colspan="2">{{_i}}Fluid columns, no fixed widths{{/i}}</td>
</tr>
<tr>
- <td>{{_i}}Large display{{/i}}</td>
- <td>1200px and up</td>
- <td>70px</td>
- <td>30px</td>
+ <td>{{_i}}Phones{{/i}}</td>
+ <td>480px and below</td>
+ <td class="muted" colspan="2">{{_i}}Fluid columns, no fixed widths{{/i}}</td>
</tr>
</tbody>
</table>
<pre class="prettyprint linenums">
-/* {{_i}}Landscape phones and down{{/i}} */
-@media (max-width: 480px) { ... }
-
-/* {{_i}}Landscape phone to portrait tablet{{/i}} */
-@media (max-width: 767px) { ... }
+/* {{_i}}Large desktop{{/i}} */
+@media (min-width: 1200px) { ... }
/* {{_i}}Portrait tablet to landscape and desktop{{/i}} */
@media (min-width: 768px) and (max-width: 979px) { ... }
-/* {{_i}}Large desktop{{/i}} */
-@media (min-width: 1200px) { ... }
+/* {{_i}}Landscape phone to portrait tablet{{/i}} */
+@media (max-width: 767px) { ... }
+
+/* {{_i}}Landscape phones and down{{/i}} */
+@media (max-width: 480px) { ... }
</pre>