From 917df6703cf316f6609d3ef3b9b35fb250c30472 Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Tue, 21 Feb 2012 22:40:21 -0800
Subject: [PATCH] clarify responsive docs on media queries

---
 docs/assets/bootstrap.zip                 | Bin 56637 -> 56637 bytes
 docs/scaffolding.html                     |   8 ++++----
 docs/templates/pages/base-css.mustache    |  10 ++++++++--
 docs/templates/pages/scaffolding.mustache |   8 ++++----
 4 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 91d731edba3ca192e7c200410aa3d8ef1fe1e56a..7cfe0eb399d2aab5ae6334da8866afab443b400a 100644
GIT binary patch
delta 458
zcmdnHi+S%ZW}X0VW)?065IDDaB99_lbGM6sOZViD3q?8L!U3vmEihqeCZM_*wqSwg
z?v1xicz^<v1$iBzN;XIE_HcoOo{1ZQ4QuY+EGH3S3KA;uHG>Il@bxqTnG_(ypP8Gk
z9~#2Rzznw<WXELZ24|S!o`y;RkP!PsTbPj7#A>k6@r5d=Zkx=v$N=UPmqmJtV0#an
zz=YNv{viSqT5&_4skwVH;~iNL@7*n#$s#w!nSdT=ydyq&!%a4jsLxGrG?5)Q{n11;
zZaF~Af$QqL<$_|eF`B&7?Lah<Ew{aqbST_0LbIdzjvboFr8`a_k&g?7Cu`mn0RX0)
B#03BV

delta 458
zcmdnHi+S%ZW}X0VW)?065Rlk7kw=j&zs<$Jux;|kg`ymA;Q&>(0+_Hg6Hwg@Td+Vu
z+s4}_JWP@sCkygAvK0cA6tr!Q;O*f8s+s&u+z6~FziqReM2IO!sKnO{s&DfKUr!^D
zNdYqanYroup&^_M%y6qgc1(6|a0WXDsK2M7QUD~xKG7B?<TbHc0A%s;g(_f+!A_P2
ziSR8lfQoE(S)`{35-K@t0ux$y_=gC{s1-N#ney8vGv1K}@!s8%nJjWsoT&gLB0hP;
zO*W9I&rNS+5uiakZu&C;Z9-C`amxW&4NzC-Ef<Ig)MR6bJ#bT<ZU>@?Y`N_Xa|_T8
dg*!&bb^t|+@7SS<T)N`~68X4Lc(UeQ5dc$5uU!BD

diff --git a/docs/scaffolding.html b/docs/scaffolding.html
index a35012e9c8..ea95796d54 100644
--- a/docs/scaffolding.html
+++ b/docs/scaffolding.html
@@ -486,13 +486,13 @@
             <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>
diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index 72b09c2718..8345e4a248 100644
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -589,10 +589,16 @@
         </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>
diff --git a/docs/templates/pages/scaffolding.mustache b/docs/templates/pages/scaffolding.mustache
index fff47d4383..d9a2f50d19 100644
--- a/docs/templates/pages/scaffolding.mustache
+++ b/docs/templates/pages/scaffolding.mustache
@@ -410,13 +410,13 @@
             <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>