2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-17 19:21:23 +03:00

Merge branch '2.2.2-wip' into 3.0.0-wip

Conflicts:
	README.md
	docs/assets/css/bootstrap.css
	docs/assets/js/bootstrap.js
	docs/assets/js/bootstrap.min.js
	docs/examples/fluid.html
	docs/scaffolding.html
	less/breadcrumbs.less
	less/popovers.less
	less/responsive.less
This commit is contained in:
Mark Otto
2012-12-05 11:05:10 -08:00
39 changed files with 279 additions and 354 deletions
+10
View File
@@ -40,17 +40,27 @@
border-color: @state-success-border;
color: @state-success-text;
}
.alert-success h4 {
color: @state-success-text;
}
.alert-danger,
.alert-error {
background-color: @state-error-background;
border-color: @state-error-border;
color: @state-error-text;
}
.alert-danger h4,
.alert-error h4 {
color: @state-error-text;
}
.alert-info {
background-color: @state-info-background;
border-color: @state-info-border;
color: @state-info-text;
}
.alert-info h4 {
color: @state-info-text;
}
// Block alerts