rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-01-17 09:52:29 +01:00
Code Issues Actions Packages Releases Activity

fixes #4896: reflect media query order in docs

Browse Source
This commit is contained in:
Mark Otto 2012-08-31 23:12:02 -07:00
parent 0f85e8b7f8
commit 00d6f26270
2 changed files with 50 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
docs/scaffolding.html
View File

@ -413,20 +413,10 @@
</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>
</tr> <td>30px</td>
<tr>
<td>Phones to tablets</td>
<td>767px and below</td>
<td class="muted" colspan="2">Fluid columns, no fixed widths</td>
</tr>
<tr>
<td>Portrait tablets</td>
<td>768px and above</td>
<td>42px</td>
<td>20px</td>
</tr> </tr>
<tr> <tr>
<td>Default</td> <td>Default</td>
@ -435,25 +425,35 @@
<td>20px</td> <td>20px</td>
</tr> </tr>
<tr> <tr>
<td>Large display</td> <td>Portrait tablets</td>
<td>1200px and up</td> <td>768px and above</td>
<td>70px</td> <td>42px</td>
<td>30px</td> <td>20px</td>
</tr>
<tr>
<td>Phones to tablets</td>
<td>767px and below</td>
<td class="muted" colspan="2">Fluid columns, no fixed widths</td>
</tr>
<tr>
<td>Phones</td>
<td>480px and below</td>
<td class="muted" colspan="2">Fluid columns, no fixed widths</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>

50
docs/templates/pages/scaffolding.mustache vendored
View File

@ -345,20 +345,10 @@
</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>
</tr> <td>30px</td>
<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>
</tr>
<tr>
<td>{{_i}}Portrait tablets{{/i}}</td>
<td>768px and above</td>
<td>42px</td>
<td>20px</td>
</tr> </tr>
<tr> <tr>
<td>{{_i}}Default{{/i}}</td> <td>{{_i}}Default{{/i}}</td>
@ -367,25 +357,35 @@
<td>20px</td> <td>20px</td>
</tr> </tr>
<tr> <tr>
<td>{{_i}}Large display{{/i}}</td> <td>{{_i}}Portrait tablets{{/i}}</td>
<td>1200px and up</td> <td>768px and above</td>
<td>70px</td> <td>42px</td>
<td>30px</td> <td>20px</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>
</tr>
<tr>
<td>{{_i}}Phones{{/i}}</td>
<td>480px and below</td>
<td class="muted" colspan="2">{{_i}}Fluid columns, no fixed widths{{/i}}</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>