mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-05 16:42:29 +03:00
Code Activity

Merge branch '3.0.0-wip' into bs3_panel_base_class

Browse Source 
Conflicts:
	dist/css/bootstrap-theme.min.css
	dist/css/bootstrap.min.css
This commit is contained in:
Mark Otto
2013-08-18 20:11:04 -07:00
parent 0615142834 2e91843661
commit a1db2d7a5e
13 changed files with 74 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files
less/theme.less
+1 -1
View File
@@ -148,9 +148,9 @@
}
// Apply the mixin to the alerts
.alert { .alert-styles(@alert-bg); }
.alert-success { .alert-styles(@alert-success-bg); }
.alert-info { .alert-styles(@alert-info-bg); }
.alert-warning { .alert-styles(@alert-warning-bg); }
.alert-danger { .alert-styles(@alert-danger-bg); }