diff options
| author | Mark Otto <[email protected]> | 2013-08-18 20:11:04 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-08-18 20:11:04 -0700 |
| commit | a1db2d7a5ee452ee272f0d040aceec6f947a8b75 (patch) | |
| tree | 124eb3d18c886b08b725a2b6e0c41c44c3abcff0 /less/theme.less | |
| parent | 0615142834343af8c40cd7ad47c498431745f080 (diff) | |
| parent | 2e9184366129139bb9b64b679a0e75a3c556465e (diff) | |
| download | bootstrap-a1db2d7a5ee452ee272f0d040aceec6f947a8b75.tar.xz bootstrap-a1db2d7a5ee452ee272f0d040aceec6f947a8b75.zip | |
Merge branch '3.0.0-wip' into bs3_panel_base_class
Conflicts:
dist/css/bootstrap-theme.min.css
dist/css/bootstrap.min.css
Diffstat (limited to 'less/theme.less')
| -rw-r--r-- | less/theme.less | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/less/theme.less b/less/theme.less index ee26ea4c6..92469c429 100644 --- a/less/theme.less +++ b/less/theme.less @@ -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); } |