aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBas Bosman <[email protected]>2014-06-17 23:35:35 +0200
committerBas Bosman <[email protected]>2014-06-18 00:00:28 +0200
commit128e52ff29be0f275bb92693c9db3ba34d5c003d (patch)
tree6faa955a5bee3178f578bd04b844fdf1625188d7
parent5b9e2bf1265eb50c0d4105b2eb3da12280c37430 (diff)
downloadbootstrap-128e52ff29be0f275bb92693c9db3ba34d5c003d.tar.xz
bootstrap-128e52ff29be0f275bb92693c9db3ba34d5c003d.zip
Fix dismissible spelling
-rw-r--r--docs/_includes/components/alerts.html8
-rw-r--r--docs/_includes/js/popovers.html4
-rw-r--r--docs/_includes/nav/components.html2
-rw-r--r--less/alerts.less5
4 files changed, 10 insertions, 9 deletions
diff --git a/docs/_includes/components/alerts.html b/docs/_includes/components/alerts.html
index f0895b0ed..749ecc2b4 100644
--- a/docs/_includes/components/alerts.html
+++ b/docs/_includes/components/alerts.html
@@ -32,16 +32,16 @@
<div class="alert alert-danger" role="alert">...</div>
{% endhighlight %}
- <h2 id="alerts-dismissable">Dismissable alerts</h2>
- <p>Build on any alert by adding an optional <code>.alert-dismissable</code> and close button.</p>
+ <h2 id="alerts-dismissible">Dismissible alerts</h2>
+ <p>Build on any alert by adding an optional <code>.alert-dismissible</code> and close button.</p>
<div class="bs-example">
- <div class="alert alert-warning alert-dismissable" role="alert">
+ <div class="alert alert-warning alert-dismissible" role="alert">
<button type="button" class="close" data-dismiss="alert"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
<strong>Warning!</strong> Better check yourself, you're not looking too good.
</div>
</div>
{% highlight html %}
-<div class="alert alert-warning alert-dismissable" role="alert">
+<div class="alert alert-warning alert-dismissible" role="alert">
<button type="button" class="close" data-dismiss="alert"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
<strong>Warning!</strong> Better check yourself, you're not looking too good.
</div>
diff --git a/docs/_includes/js/popovers.html b/docs/_includes/js/popovers.html
index 53320fc4a..db3cf0e59 100644
--- a/docs/_includes/js/popovers.html
+++ b/docs/_includes/js/popovers.html
@@ -111,10 +111,10 @@ sagittis lacus vel augue laoreet rutrum faucibus.">
<h4>Dismiss on next click</h4>
<p>Use the <code>focus</code> trigger to dismiss popovers on their next click.</p>
<div class="bs-example" style="padding-bottom: 24px;">
- <button type="button" class="btn btn-lg btn-danger bs-docs-popover-dismiss" data-toggle="popover" title="Dismissable popover" data-content="And here's some amazing content. It's very engaging. Right?">Dismissable popover</button>
+ <button type="button" class="btn btn-lg btn-danger bs-docs-popover-dismiss" data-toggle="popover" title="Dismissible popover" data-content="And here's some amazing content. It's very engaging. Right?">Dismissible popover</button>
</div>
{% highlight html %}
-<button type="button" class="btn btn-lg btn-danger popover-dismiss" data-toggle="popover" title="Dismissable popover" data-content="And here's some amazing content. It's very engaging. Right?">Dismissable popover</button>
+<button type="button" class="btn btn-lg btn-danger popover-dismiss" data-toggle="popover" title="Dismissible popover" data-content="And here's some amazing content. It's very engaging. Right?">Dismissible popover</button>
{% endhighlight %}
{% highlight js %}
$('.popover-dismiss').popover({
diff --git a/docs/_includes/nav/components.html b/docs/_includes/nav/components.html
index e850f3abc..647e1ec81 100644
--- a/docs/_includes/nav/components.html
+++ b/docs/_includes/nav/components.html
@@ -94,7 +94,7 @@
<a href="#alerts">Alerts</a>
<ul class="nav">
<li><a href="#alerts-examples">Examples</a></li>
- <li><a href="#alerts-dismissable">Dismissable alerts</a></li>
+ <li><a href="#alerts-dismissible">Dismissible alerts</a></li>
<li><a href="#alerts-links">Links in alerts</a></li>
</ul>
</li>
diff --git a/less/alerts.less b/less/alerts.less
index c3afeb958..df070b8ab 100644
--- a/less/alerts.less
+++ b/less/alerts.less
@@ -33,11 +33,12 @@
}
}
-// Dismissable alerts
+// Dismissible alerts
//
// Expand the right padding and account for the close button's positioning.
-.alert-dismissable {
+.alert-dismissable, // The misspelled .alert-dismissable was deprecated in 3.2.0.
+.alert-dismissible {
padding-right: (@alert-padding + 20);
// Adjust close link position