mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-08 17:22:31 +03:00
Code Activity

Merge branch '2.2.2-wip' into exploratory

Browse Source 
Conflicts:
	docs/assets/css/bootstrap.css
	docs/components.html
	docs/templates/pages/components.mustache
	less/alerts.less
	less/button-groups.less
	less/buttons.less
	less/tests/css-tests.html
This commit is contained in:
Mark Otto
2012-11-30 00:13:30 -08:00
parent 7e56e2265d bca3ff4ed6
commit fca35c0dba
29 changed files with 789 additions and 189 deletions
Download Patch File Download Diff File Expand all files Collapse all files
less/alerts.less
+4
View File
@@ -13,6 +13,10 @@
background-color: @warningBackground;
border: 1px solid @warningBorder;
border-radius: @baseBorderRadius;
}
.alert,
.alert h4 {
// Specified for the h4 to prevent conflicts of changing @headingsColor
color: @warningText;
}
.alert h4 {