aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
Diffstat (limited to 'docs')
-rw-r--r--docs/assets/bootstrap.zipbin56637 -> 56637 bytes
-rw-r--r--docs/scaffolding.html8
-rw-r--r--docs/templates/pages/base-css.mustache10
-rw-r--r--docs/templates/pages/scaffolding.mustache8
4 files changed, 16 insertions, 10 deletions
diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 91d731edb..7cfe0eb39 100644
--- a/docs/assets/bootstrap.zip
+++ b/docs/assets/bootstrap.zip
Binary files differ
diff --git a/docs/scaffolding.html b/docs/scaffolding.html
index a35012e9c..ea95796d5 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 72b09c271..8345e4a24 100644
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -589,11 +589,17 @@
</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>
<td>Thornton</td>
diff --git a/docs/templates/pages/scaffolding.mustache b/docs/templates/pages/scaffolding.mustache
index fff47d438..d9a2f50d1 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>