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
dc4436db
Commit
dc4436db
authored
12 years ago
by
Mark Otto
Browse files
Options
Download
Email Patches
Plain Diff
Only use .danger for alerts, no more .error
parent
0c9b161b
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
docs/assets/css/bootstrap.css
+3
-7
docs/assets/css/bootstrap.css
docs/docs.html
+2
-2
docs/docs.html
less/alerts.less
+1
-2
less/alerts.less
with
6 additions
and
11 deletions
+6
-11
docs/assets/css/bootstrap.css
+
3
-
7
View file @
dc4436db
...
@@ -4663,22 +4663,18 @@ button.close {
...
@@ -4663,22 +4663,18 @@ button.close {
color
:
#356635
;
color
:
#356635
;
}
}
.alert-danger
,
.alert-danger
{
.alert-error
{
color
:
#b94a48
;
color
:
#b94a48
;
background-color
:
#f2dede
;
background-color
:
#f2dede
;
border-color
:
#eed3d7
;
border-color
:
#eed3d7
;
}
}
.alert-danger
hr
,
.alert-danger
hr
{
.alert-error
hr
{
border-top-color
:
#e6c1c7
;
border-top-color
:
#e6c1c7
;
}
}
.alert-danger
>
a
,
.alert-danger
>
a
,
.alert-error
>
a
,
.alert-danger
>
p
>
a
{
.alert-danger
>
p
>
a
,
.alert-error
>
p
>
a
{
color
:
#953b39
;
color
:
#953b39
;
}
}
...
...
This diff is collapsed.
Click to expand it.
docs/docs.html
+
2
-
2
View file @
dc4436db
...
@@ -4246,7 +4246,7 @@ body {
...
@@ -4246,7 +4246,7 @@ body {
<h3
id=
"alerts-alternatives"
>
Contextual alternatives
</h3>
<h3
id=
"alerts-alternatives"
>
Contextual alternatives
</h3>
<p>
Add optional classes to change an alert's connotation.
</p>
<p>
Add optional classes to change an alert's connotation.
</p>
<div
class=
"bs-docs-example"
>
<div
class=
"bs-docs-example"
>
<div
class=
"alert alert-
erro
r"
>
<div
class=
"alert alert-
dange
r"
>
<button
type=
"button"
class=
"close"
data-dismiss=
"alert"
>
×
</button>
<button
type=
"button"
class=
"close"
data-dismiss=
"alert"
>
×
</button>
<strong>
Oh snap!
</strong>
Change a few things up and try submitting again.
<strong>
Oh snap!
</strong>
Change a few things up and try submitting again.
</div>
</div>
...
@@ -4260,7 +4260,7 @@ body {
...
@@ -4260,7 +4260,7 @@ body {
</div>
</div>
</div>
</div>
{% highlight html linenos %}
{% highlight html linenos %}
<div
class=
"alert alert-
erro
r"
>
...
</div>
<div
class=
"alert alert-
dange
r"
>
...
</div>
<div
class=
"alert alert-success"
>
...
</div>
<div
class=
"alert alert-success"
>
...
</div>
<div
class=
"alert alert-info"
>
...
</div>
<div
class=
"alert alert-info"
>
...
</div>
{% endhighlight %}
{% endhighlight %}
...
...
This diff is collapsed.
Click to expand it.
less/alerts.less
+
1
-
2
View file @
dc4436db
...
@@ -55,8 +55,7 @@
...
@@ -55,8 +55,7 @@
color: darken(@state-success-text, 10%);
color: darken(@state-success-text, 10%);
}
}
}
}
.alert-danger,
.alert-danger {
.alert-error {
background-color: @state-danger-bg;
background-color: @state-danger-bg;
border-color: @state-danger-border;
border-color: @state-danger-border;
color: @state-danger-text;
color: @state-danger-text;
...
...
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