]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
clarify responsive docs on media queries
authorMark Otto <markotto@twitter.com>
Wed, 22 Feb 2012 06:40:21 +0000 (22:40 -0800)
committerMark Otto <markotto@twitter.com>
Wed, 22 Feb 2012 06:40:21 +0000 (22:40 -0800)
docs/assets/bootstrap.zip
docs/scaffolding.html
docs/templates/pages/base-css.mustache
docs/templates/pages/scaffolding.mustache

index 91d731edba3ca192e7c200410aa3d8ef1fe1e56a..7cfe0eb399d2aab5ae6334da8866afab443b400a 100644 (file)
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
index a35012e9c8b08f5cc170d6faaa5baeb93e10ed2f..ea95796d546f4fb18d926d2ca854af1925ea0d8b 100644 (file)
             <td class="muted" colspan="2">Fluid columns, no fixed widths</td>
           </tr>
           <tr>
-            <td>Portrait tablets</td>
-            <td>480px to 768px</td>
+            <td>Smartphones to tablets</td>
+            <td>767px and below</td>
             <td class="muted" colspan="2">Fluid columns, no fixed widths</td>
           </tr>
           <tr>
-            <td>Landscape tablets</td>
-            <td>768px to 979px</td>
+            <td>Portrait tablets</td>
+            <td>768px and above</td>
             <td>42px</td>
             <td>20px</td>
           </tr>
index 72b09c271808d3debd5a0dc154f7962e13508044..8345e4a24845380a39492e32c71e28be5688ba2d 100644 (file)
         </thead>
         <tbody>
           <tr>
-            <td>1</td>
-            <td colspan="2">Mark Otto</td>
+            <td rowspan="2">1</td>
+            <td>Mark</td>
+            <td>Otto</td>
             <td>CSS</td>
           </tr>
+          <tr>
+            <td>Mark</td>
+            <td>Otto</td>
+            <td>HTML</td>
+          </tr>
           <tr>
             <td>2</td>
             <td>Jacob</td>
index fff47d438380c36670d5784af2c26dff4a5e8b55..d9a2f50d19f463097b9b796ad2e5568afa3b9328 100644 (file)
             <td class="muted" colspan="2">{{_i}}Fluid columns, no fixed widths{{/i}}</td>
           </tr>
           <tr>
-            <td>{{_i}}Portrait tablets{{/i}}</td>
-            <td>480px to 768px</td>
+            <td>{{_i}}Smartphones 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}}Landscape tablets{{/i}}</td>
-            <td>768px to 979px</td>
+            <td>{{_i}}Portrait tablets{{/i}}</td>
+            <td>768px and above</td>
             <td>42px</td>
             <td>20px</td>
           </tr>