diff options
| author | Mark Otto <[email protected]> | 2013-08-18 20:15:45 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-08-18 20:15:45 -0700 |
| commit | a9378a92670f4bf5ccb753191af795c45bb64998 (patch) | |
| tree | 9690c9a1c123c3103a1f345015f93aac8b43e983 /less/theme.less | |
| parent | cf09e6a6b5e314f4f7433f21bd32287885c95451 (diff) | |
| parent | f584500211af84038bcff9b363343eb02cda6ccd (diff) | |
| download | bootstrap-a9378a92670f4bf5ccb753191af795c45bb64998.tar.xz bootstrap-a9378a92670f4bf5ccb753191af795c45bb64998.zip | |
Merge branch '3.0.0-wip' into bs3_homepage
Conflicts:
customize.html
dist/css/bootstrap.min.css
Diffstat (limited to 'less/theme.less')
| -rw-r--r-- | less/theme.less | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/less/theme.less b/less/theme.less index d2f98f2fb..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); } @@ -211,7 +211,7 @@ } // Apply the mixin to the panel headings only -.panel-heading { .panel-heading-styles(@panel-heading-bg); } +.panel-default > .panel-heading { .panel-heading-styles(@panel-default-heading-bg); } .panel-primary > .panel-heading { .panel-heading-styles(@panel-primary-heading-bg); } .panel-success > .panel-heading { .panel-heading-styles(@panel-success-heading-bg); } .panel-info > .panel-heading { .panel-heading-styles(@panel-info-heading-bg); } |