Skip to content

B
bootstrap
Commit 00d6f262 authored by Mark Otto's avatar Mark Otto
Browse files
Options

fixes #4896: reflect media query order in docs

parent 0f85e8b7
Hide whitespace changes
Inline Side-by-side
Showing with 42 additions and 42 deletions
docs/scaffolding.html
View file @ 00d6f262
...@@ -413,14 +413,16 @@ ...@@ -413,14 +413,16 @@
</thead> </thead>
<tbody> <tbody>
<tr> <tr>
<td>Phones</td> <td>Large display</td>
<td>480px and below</td> <td>1200px and up</td>
<td class="muted" colspan="2">Fluid columns, no fixed widths</td> <td>70px</td>
<td>30px</td>
</tr> </tr>
<tr> <tr>
<td>Phones to tablets</td> <td>Default</td>
<td>767px and below</td> <td>980px and up</td>
<td class="muted" colspan="2">Fluid columns, no fixed widths</td> <td>60px</td>
<td>20px</td>
</tr> </tr>
<tr> <tr>
<td>Portrait tablets</td> <td>Portrait tablets</td>
...@@ -429,31 +431,29 @@ ...@@ -429,31 +431,29 @@
<td>20px</td> <td>20px</td>
</tr> </tr>
<tr> <tr>
<td>Default</td> <td>Phones to tablets</td>
<td>980px and up</td> <td>767px and below</td>
<td>60px</td> <td class="muted" colspan="2">Fluid columns, no fixed widths</td>
<td>20px</td>
</tr> </tr>
<tr> <tr>
<td>Large display</td> <td>Phones</td>
<td>1200px and up</td> <td>480px and below</td>
<td>70px</td> <td class="muted" colspan="2">Fluid columns, no fixed widths</td>
<td>30px</td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
<pre class="prettyprint linenums"> <pre class="prettyprint linenums">
/* Landscape phones and down */ /* Large desktop */
@media (max-width: 480px) { ... } @media (min-width: 1200px) { ... }
/* Landscape phone to portrait tablet */
@media (max-width: 767px) { ... }
/* Portrait tablet to landscape and desktop */ /* Portrait tablet to landscape and desktop */
@media (min-width: 768px) and (max-width: 979px) { ... } @media (min-width: 768px) and (max-width: 979px) { ... }
/* Large desktop */ /* Landscape phone to portrait tablet */
@media (min-width: 1200px) { ... } @media (max-width: 767px) { ... }
/* Landscape phones and down */
@media (max-width: 480px) { ... }
</pre> </pre>
......
docs/templates/pages/scaffolding.mustache
View file @ 00d6f262
...@@ -345,14 +345,16 @@ ...@@ -345,14 +345,16 @@
</thead> </thead>
<tbody> <tbody>
<tr> <tr>
<td>{{_i}}Phones{{/i}}</td> <td>{{_i}}Large display{{/i}}</td>
<td>480px and below</td> <td>1200px and up</td>
<td class="muted" colspan="2">{{_i}}Fluid columns, no fixed widths{{/i}}</td> <td>70px</td>
<td>30px</td>
</tr> </tr>
<tr> <tr>
<td>{{_i}}Phones to tablets{{/i}}</td> <td>{{_i}}Default{{/i}}</td>
<td>767px and below</td> <td>980px and up</td>
<td class="muted" colspan="2">{{_i}}Fluid columns, no fixed widths{{/i}}</td> <td>60px</td>
<td>20px</td>
</tr> </tr>
<tr> <tr>
<td>{{_i}}Portrait tablets{{/i}}</td> <td>{{_i}}Portrait tablets{{/i}}</td>
...@@ -361,31 +363,29 @@ ...@@ -361,31 +363,29 @@
<td>20px</td> <td>20px</td>
</tr> </tr>
<tr> <tr>
<td>{{_i}}Default{{/i}}</td> <td>{{_i}}Phones to tablets{{/i}}</td>
<td>980px and up</td> <td>767px and below</td>
<td>60px</td> <td class="muted" colspan="2">{{_i}}Fluid columns, no fixed widths{{/i}}</td>
<td>20px</td>
</tr> </tr>
<tr> <tr>
<td>{{_i}}Large display{{/i}}</td> <td>{{_i}}Phones{{/i}}</td>
<td>1200px and up</td> <td>480px and below</td>
<td>70px</td> <td class="muted" colspan="2">{{_i}}Fluid columns, no fixed widths{{/i}}</td>
<td>30px</td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
<pre class="prettyprint linenums"> <pre class="prettyprint linenums">
/* {{_i}}Landscape phones and down{{/i}} */ /* {{_i}}Large desktop{{/i}} */
@media (max-width: 480px) { ... } @media (min-width: 1200px) { ... }
/* {{_i}}Landscape phone to portrait tablet{{/i}} */
@media (max-width: 767px) { ... }
/* {{_i}}Portrait tablet to landscape and desktop{{/i}} */ /* {{_i}}Portrait tablet to landscape and desktop{{/i}} */
@media (min-width: 768px) and (max-width: 979px) { ... } @media (min-width: 768px) and (max-width: 979px) { ... }
/* {{_i}}Large desktop{{/i}} */ /* {{_i}}Landscape phone to portrait tablet{{/i}} */
@media (min-width: 1200px) { ... } @media (max-width: 767px) { ... }
/* {{_i}}Landscape phones and down{{/i}} */
@media (max-width: 480px) { ... }
</pre> </pre>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment