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/variables.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/variables.less')
| -rw-r--r-- | less/variables.less | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/less/variables.less b/less/variables.less index 53aad251b..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 // ------------------------- @@ -486,11 +486,14 @@ // Panels // ------------------------- @panel-bg: #fff; -@panel-border: #ddd; +@panel-inner-border: #ddd; @panel-border-radius: @border-radius-base; -@panel-heading-bg: #f5f5f5; @panel-footer-bg: #f5f5f5; +@panel-default-text: @gray-dark; +@panel-default-border: #ddd; +@panel-default-heading-bg: #f5f5f5; + @panel-primary-text: #fff; @panel-primary-border: @brand-primary; @panel-primary-heading-bg: @brand-primary; |