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/variables.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/variables.less')
| -rw-r--r-- | less/variables.less | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/less/variables.less b/less/variables.less index 70e884432..eadd78fb8 100644 --- a/less/variables.less +++ b/less/variables.less @@ -439,22 +439,22 @@ @alert-border-radius: @border-radius-base; @alert-link-font-weight: bold; -@alert-bg: @state-warning-bg; -@alert-text: @state-warning-text; -@alert-border: @state-warning-border; - @alert-success-bg: @state-success-bg; @alert-success-text: @state-success-text; @alert-success-border: @state-success-border; -@alert-danger-bg: @state-danger-bg; -@alert-danger-text: @state-danger-text; -@alert-danger-border: @state-danger-border; - @alert-info-bg: @state-info-bg; @alert-info-text: @state-info-text; @alert-info-border: @state-info-border; +@alert-warning-bg: @state-warning-bg; +@alert-warning-text: @state-warning-text; +@alert-warning-border: @state-warning-border; + +@alert-danger-bg: @state-danger-bg; +@alert-danger-text: @state-danger-text; +@alert-danger-border: @state-danger-border; + // Progress bars // ------------------------- |