aboutsummaryrefslogtreecommitdiff
path: root/components.html
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-08-31 09:04:17 +0200
committerMark Otto <[email protected]>2013-08-31 09:04:17 +0200
commit3e62905f9da8d2589ae5cca3c870668cb35aec11 (patch)
tree46d27a6860c7e7f9eb6c08f662f2c1d4c629a9fc /components.html
parent58408b02329b620e4cd0c206bd9b4f5100f77a72 (diff)
parent644c227ae16a9870c6aa456e0dc826fab0e5fa2e (diff)
downloadbootstrap-3e62905f9da8d2589ae5cca3c870668cb35aec11.tar.xz
bootstrap-3e62905f9da8d2589ae5cca3c870668cb35aec11.zip
Merge branch 'master' of github.com:twbs/bootstrap
Diffstat (limited to 'components.html')
-rw-r--r--components.html4
1 files changed, 2 insertions, 2 deletions
diff --git a/components.html b/components.html
index 9b724b209..12c72e00a 100644
--- a/components.html
+++ b/components.html
@@ -1499,7 +1499,7 @@ base_url: "../"
<h2 id="navbar-forms">Forms</h2>
<p>Place form content within <code>.navbar-form</code> for proper vertical alignment and collapsed behavior in narrow viewports. Use the alignment options to decide where it resides within the navbar content.</p>
- <p>As a heads up, <code>.navbar-form</code> shares much of it's code with <code>.form-inline</code> via mixin.</p>
+ <p>As a heads up, <code>.navbar-form</code> shares much of its code with <code>.form-inline</code> via mixin.</p>
<div class="bs-example">
<nav class="navbar navbar-default" role="navigation">
<div class="navbar-header">
@@ -2209,7 +2209,7 @@ body { padding-bottom: 70px; }
<div class="page-header">
<h1 id="alerts">Alerts</h1>
</div>
- <p class="lead">Provide contextual feedback messages for typical user actions with the handful of available and flexible alert messages. For inline dismissal, use the <a href="../javascript/#js-alerts">alerts jQuery plugin</a>.</p>
+ <p class="lead">Provide contextual feedback messages for typical user actions with the handful of available and flexible alert messages. For inline dismissal, use the <a href="../javascript/#alerts">alerts jQuery plugin</a>.</p>
<h2 id="alerts-examples">Examples</h2>
<p>Wrap any text and an optional dismiss button in <code>.alert</code> and one of the four contextual classes (e.g., <code>.alert-success</code>) for basic alert messages.</p>