diff options
| author | Mark Otto <[email protected]> | 2012-03-22 09:06:59 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-03-22 09:06:59 -0700 |
| commit | 0f57bdab754d72697f412eb32723a83b2de9921e (patch) | |
| tree | 15a8ed4a3eb73da9371ad545a887e109a554c0df /docs | |
| parent | d335adf644b213a5ebc9cee3f37f781ad55194ef (diff) | |
| parent | cdd158c57182092a7ced90af06e7dcc0e4e8e29b (diff) | |
| download | bootstrap-0f57bdab754d72697f412eb32723a83b2de9921e.tar.xz bootstrap-0f57bdab754d72697f412eb32723a83b2de9921e.zip | |
Merge branch 'doc-typos' of https://github.com/ZeroGravX/bootstrap into ZeroGravX-doc-typos
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/components.html | 6 | ||||
| -rw-r--r-- | docs/scaffolding.html | 4 | ||||
| -rw-r--r-- | docs/templates/pages/components.mustache | 6 | ||||
| -rw-r--r-- | docs/templates/pages/scaffolding.mustache | 4 |
4 files changed, 10 insertions, 10 deletions
diff --git a/docs/components.html b/docs/components.html index 10b2aec20..a8979729e 100644 --- a/docs/components.html +++ b/docs/components.html @@ -1040,7 +1040,7 @@ </pre> </div><!--/span--> </div><!--/row--> - <p>When you affix the navbar, remember to account for the hidden area underneath. Add 40px or more of apdding to the <code><body></code>. Be sure to add this after the core Bootstrap CSS and before the optional responsive CSS.</p> + <p>When you affix the navbar, remember to account for the hidden area underneath. Add 40px or more of padding to the <code><body></code>. Be sure to add this after the core Bootstrap CSS and before the optional responsive CSS.</p> <h3>Brand name</h3> <p>A simple link to show your brand or project name only requires an anchor tag.</p> <pre class="prettyprint linenums"> @@ -1115,7 +1115,7 @@ <h3>Component alignment</h3> <p>To align a nav, search form, or text, use the <code>.pull-left</code> or <code>.pull-right</code> utility classes. Both classes will add a CSS float in the specified direction.</p> <h3>Adding dropdown menus</h3> - <p>Adding dropdowns and dropups to the nav is super simple, but does require the use of <a href="./javascript.html/#dropdown">our javascript plugin</a>.</p> + <p>Adding dropdowns and dropups to the nav is super simple, but does require the use of <a href="./javascript.html#dropdowns">our javascript plugin</a>.</p> <pre class="prettyprint linenums"> <ul class="nav"> <li class="dropdown"> @@ -1516,7 +1516,7 @@ <h2>Page header</h2> <div class="row"> <div class="span4"> - <p>A simple shell for an <code>h1</code> to appropratiely space out and segment sections of content on a page. It can utilize the <code>h1</code>'s default <code>small</code>, element as well most other components (with additional styles).</p> + <p>A simple shell for an <code>h1</code> to appropriately space out and segment sections of content on a page. It can utilize the <code>h1</code>'s default <code>small</code>, element as well most other components (with additional styles).</p> </div> <div class="span8"> <div class="page-header"> diff --git a/docs/scaffolding.html b/docs/scaffolding.html index 29491c118..f5a756790 100644 --- a/docs/scaffolding.html +++ b/docs/scaffolding.html @@ -554,7 +554,7 @@ <div class="row"> <div class="span4"> <h3>What are they</h2> - <p>For faster mobile-friendly development, use these basic utility classes for showing and hidding content by device.</p> + <p>For faster mobile-friendly development, use these basic utility classes for showing and hiding content by device.</p> <h3>When to use</h2> <p>Use on a limited basis and avoid creating entirely different versions of the same site. Instead, use them to complement each device's presentation.</p> <p>For example, you might show a <code><select></code> element for nav on mobile layouts, but not on tablets or desktops.</p> @@ -611,7 +611,7 @@ </tbody> </table> <h3>Test case</h3> - <p>Resize your browser or load on different devices to test the above clases.</p> + <p>Resize your browser or load on different devices to test the above classes.</p> <h4>Visible on...</h4> <ul class="responsive-utilities-test"> <li>Phone<span class="visible-phone">✔ Phone</span></li> diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache index 1a7f5b91a..a3aabe966 100644 --- a/docs/templates/pages/components.mustache +++ b/docs/templates/pages/components.mustache @@ -964,7 +964,7 @@ </pre> </div><!--/span--> </div><!--/row--> - <p>{{_i}}When you affix the navbar, remember to account for the hidden area underneath. Add 40px or more of apdding to the <code><body></code>. Be sure to add this after the core Bootstrap CSS and before the optional responsive CSS.{{/i}}</p> + <p>{{_i}}When you affix the navbar, remember to account for the hidden area underneath. Add 40px or more of padding to the <code><body></code>. Be sure to add this after the core Bootstrap CSS and before the optional responsive CSS.{{/i}}</p> <h3>{{_i}}Brand name{{/i}}</h3> <p>{{_i}}A simple link to show your brand or project name only requires an anchor tag.{{/i}}</p> <pre class="prettyprint linenums"> @@ -1039,7 +1039,7 @@ <h3>{{_i}}Component alignment{{/i}}</h3> <p>{{_i}}To align a nav, search form, or text, use the <code>.pull-left</code> or <code>.pull-right</code> utility classes. Both classes will add a CSS float in the specified direction.{{/i}}</p> <h3>{{_i}}Adding dropdown menus{{/i}}</h3> - <p>{{_i}}Adding dropdowns and dropups to the nav is super simple, but does require the use of <a href="./javascript.html/#dropdown">our javascript plugin</a>.{{/i}}</p> + <p>{{_i}}Adding dropdowns and dropups to the nav is super simple, but does require the use of <a href="./javascript.html#dropdowns">our javascript plugin</a>.{{/i}}</p> <pre class="prettyprint linenums"> <ul class="nav"> <li class="dropdown"> @@ -1440,7 +1440,7 @@ <h2>{{_i}}Page header{{/i}}</h2> <div class="row"> <div class="span4"> - <p>{{_i}}A simple shell for an <code>h1</code> to appropratiely space out and segment sections of content on a page. It can utilize the <code>h1</code>'s default <code>small</code>, element as well most other components (with additional styles).{{/i}}</p> + <p>{{_i}}A simple shell for an <code>h1</code> to appropriately space out and segment sections of content on a page. It can utilize the <code>h1</code>'s default <code>small</code>, element as well most other components (with additional styles).{{/i}}</p> </div> <div class="span8"> <div class="page-header"> diff --git a/docs/templates/pages/scaffolding.mustache b/docs/templates/pages/scaffolding.mustache index 97131fdf2..2d6d54c4c 100644 --- a/docs/templates/pages/scaffolding.mustache +++ b/docs/templates/pages/scaffolding.mustache @@ -478,7 +478,7 @@ <div class="row"> <div class="span4"> <h3>{{_i}}What are they{{/i}}</h2> - <p>{{_i}}For faster mobile-friendly development, use these basic utility classes for showing and hidding content by device.{{/i}}</p> + <p>{{_i}}For faster mobile-friendly development, use these basic utility classes for showing and hiding content by device.{{/i}}</p> <h3>{{_i}}When to use{{/i}}</h2> <p>{{_i}}Use on a limited basis and avoid creating entirely different versions of the same site. Instead, use them to complement each device's presentation.{{/i}}</p> <p>{{_i}}For example, you might show a <code><select></code> element for nav on mobile layouts, but not on tablets or desktops.{{/i}}</p> @@ -535,7 +535,7 @@ </tbody> </table> <h3>{{_i}}Test case{{/i}}</h3> - <p>{{_i}}Resize your browser or load on different devices to test the above clases.{{/i}}</p> + <p>{{_i}}Resize your browser or load on different devices to test the above classes.{{/i}}</p> <h4>{{_i}}Visible on...{{/i}}</h4> <ul class="responsive-utilities-test"> <li>Phone<span class="visible-phone">✔ Phone</span></li> |
