Skip to content
GitLab
Explore
Projects
Groups
Snippets
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Bootstrap
bootstrap
Commits
128e52ff
Commit
128e52ff
authored
10 years ago
by
Bas Bosman
Browse files
Options
Download
Email Patches
Plain Diff
Fix dismissible spelling
parent
5b9e2bf1
5 merge requests
!28721
Hot test
,
!13845
Fix dismissible spelling
,
!16605
Test pull please ignore
,
!22103
test
,
!25326
Adjust examples
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
docs/_includes/components/alerts.html
+4
-4
docs/_includes/components/alerts.html
docs/_includes/js/popovers.html
+2
-2
docs/_includes/js/popovers.html
docs/_includes/nav/components.html
+1
-1
docs/_includes/nav/components.html
less/alerts.less
+3
-2
less/alerts.less
with
10 additions
and
9 deletions
+10
-9
docs/_includes/components/alerts.html
+
4
-
4
View file @
128e52ff
...
...
@@ -32,16 +32,16 @@
<div
class=
"alert alert-danger"
role=
"alert"
>
...
</div>
{% endhighlight %}
<h2
id=
"alerts-dismiss
a
ble"
>
Dismiss
a
ble alerts
</h2>
<p>
Build on any alert by adding an optional
<code>
.alert-dismiss
a
ble
</code>
and close button.
</p>
<h2
id=
"alerts-dismiss
i
ble"
>
Dismiss
i
ble alerts
</h2>
<p>
Build on any alert by adding an optional
<code>
.alert-dismiss
i
ble
</code>
and close button.
</p>
<div
class=
"bs-example"
>
<div
class=
"alert alert-warning alert-dismiss
a
ble"
role=
"alert"
>
<div
class=
"alert alert-warning alert-dismiss
i
ble"
role=
"alert"
>
<button
type=
"button"
class=
"close"
data-dismiss=
"alert"
><span
aria-hidden=
"true"
>
×
</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-dismiss
a
ble"
role=
"alert"
>
<div
class=
"alert alert-warning alert-dismiss
i
ble"
role=
"alert"
>
<button
type=
"button"
class=
"close"
data-dismiss=
"alert"
><span
aria-hidden=
"true"
>
×
</span><span
class=
"sr-only"
>
Close
</span></button>
<strong>
Warning!
</strong>
Better check yourself, you're not looking too good.
</div>
...
...
This diff is collapsed.
Click to expand it.
docs/_includes/js/popovers.html
+
2
-
2
View file @
128e52ff
...
...
@@ -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=
"Dismiss
a
ble popover"
data-content=
"And here's some amazing content. It's very engaging. Right?"
>
Dismiss
a
ble popover
</button>
<button
type=
"button"
class=
"btn btn-lg btn-danger bs-docs-popover-dismiss"
data-toggle=
"popover"
title=
"Dismiss
i
ble popover"
data-content=
"And here's some amazing content. It's very engaging. Right?"
>
Dismiss
i
ble popover
</button>
</div>
{% highlight html %}
<button
type=
"button"
class=
"btn btn-lg btn-danger popover-dismiss"
data-toggle=
"popover"
title=
"Dismiss
a
ble popover"
data-content=
"And here's some amazing content. It's very engaging. Right?"
>
Dismiss
a
ble popover
</button>
<button
type=
"button"
class=
"btn btn-lg btn-danger popover-dismiss"
data-toggle=
"popover"
title=
"Dismiss
i
ble popover"
data-content=
"And here's some amazing content. It's very engaging. Right?"
>
Dismiss
i
ble popover
</button>
{% endhighlight %}
{% highlight js %}
$('.popover-dismiss').popover({
...
...
This diff is collapsed.
Click to expand it.
docs/_includes/nav/components.html
+
1
-
1
View file @
128e52ff
...
...
@@ -94,7 +94,7 @@
<a
href=
"#alerts"
>
Alerts
</a>
<ul
class=
"nav"
>
<li><a
href=
"#alerts-examples"
>
Examples
</a></li>
<li><a
href=
"#alerts-dismiss
a
ble"
>
Dismiss
a
ble alerts
</a></li>
<li><a
href=
"#alerts-dismiss
i
ble"
>
Dismiss
i
ble alerts
</a></li>
<li><a
href=
"#alerts-links"
>
Links in alerts
</a></li>
</ul>
</li>
...
...
This diff is collapsed.
Click to expand it.
less/alerts.less
+
3
-
2
View file @
128e52ff
...
...
@@ -33,11 +33,12 @@
}
}
// Dismiss
a
ble alerts
// Dismiss
i
ble 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
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Snippets