diff options
| author | Jacob Thornton <[email protected]> | 2012-01-31 13:23:29 -0800 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2012-01-31 13:23:29 -0800 |
| commit | b9de88890e3db18b48ef10cd5a718002cb5dc4a0 (patch) | |
| tree | 852e83d716eb715edb6cdc44ea24ab9bb6dca294 /docs/templates | |
| parent | 0bfbe5058d61ae93d82b09f1dff7eb30dc22426e (diff) | |
| parent | cfc1c8a8cd69e86dc70a48766cd7cd318537dee3 (diff) | |
| download | bootstrap-b9de88890e3db18b48ef10cd5a718002cb5dc4a0.tar.xz bootstrap-b9de88890e3db18b48ef10cd5a718002cb5dc4a0.zip | |
Merge branch '2.0-wip'
Conflicts:
docs/assets/bootstrap.zip
Diffstat (limited to 'docs/templates')
| -rw-r--r-- | docs/templates/pages/base-css.mustache | 2 | ||||
| -rw-r--r-- | docs/templates/pages/javascript.mustache | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache index cc0b2a1ea..cc235ffd0 100644 --- a/docs/templates/pages/base-css.mustache +++ b/docs/templates/pages/base-css.mustache @@ -29,7 +29,7 @@ <div class="row"> <div class="span4"> <h3>{{_i}}Typographic scale{{/i}}</h3> - <p>{{_i}}The entire typographic grid is based on two Less variables in our preboot.less file: <code>@baseFontSize</code> and <code>@baseLineHeight</code>. The first is the base font-size used throughout and the second is the base line-height.{{/i}}</p> + <p>{{_i}}The entire typographic grid is based on two Less variables in our variables.less file: <code>@baseFontSize</code> and <code>@baseLineHeight</code>. The first is the base font-size used throughout and the second is the base line-height.{{/i}}</p> <p>{{_i}}We use those variables, and some math, to create the margins, paddings, and line-heights of all our type and more.{{/i}}</p> </div> <div class="span4"> diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache index 8841b1f7b..f2bbf0216 100644 --- a/docs/templates/pages/javascript.mustache +++ b/docs/templates/pages/javascript.mustache @@ -1212,7 +1212,7 @@ $('#myCollapsible').on('hidden', function () { <td>{{_i}}interval{{/i}}</td> <td>{{_i}}number{{/i}}</td> <td>5000</td> - <td>{{_i}}The amount of type to delay between automatically cycling an item.{{/i}}</td> + <td>{{_i}}The amount of time to delay between automatically cycling an item.{{/i}}</td> </tr> </tbody> </table> |