diff options
| author | Mark Otto <[email protected]> | 2013-08-05 20:00:23 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-08-05 20:00:23 -0700 |
| commit | 219f0fe7c54d6ece4fcfc58b140189c12e63f360 (patch) | |
| tree | 0355fdccf1ff8599f63a883dd4723c8d977e1e00 /less/variables.less | |
| parent | 0faf42b4bc3fd301beaa5b5f9b4d367f69899b05 (diff) | |
| parent | ac3cb6974ad0573812b65a2054a5809da9946cb6 (diff) | |
| download | bootstrap-219f0fe7c54d6ece4fcfc58b140189c12e63f360.tar.xz bootstrap-219f0fe7c54d6ece4fcfc58b140189c12e63f360.zip | |
Merge branch '3.0.0-wip' into bs3_alerts_default_class
Conflicts:
dist/css/bootstrap.min.css
Diffstat (limited to 'less/variables.less')
| -rw-r--r-- | less/variables.less | 24 |
1 files changed, 21 insertions, 3 deletions
diff --git a/less/variables.less b/less/variables.less index b3743755c..27b13c3ab 100644 --- a/less/variables.less +++ b/less/variables.less @@ -78,6 +78,8 @@ @component-active-bg: @brand-primary; +@caret-width-base: 4px; +@caret-width-large: 5px; // Tables // ------------------------- @@ -96,6 +98,8 @@ // Buttons // ------------------------- +@btn-font-weight: bold; + @btn-default-color: #333; @btn-default-bg: #fff; @btn-default-border: #ccc; @@ -120,6 +124,8 @@ @btn-info-bg: @brand-info; @btn-info-border: darken(@btn-info-bg, 5%); +@btn-link-disabled-color: @gray-light; + // Forms // ------------------------- @@ -404,10 +410,13 @@ // Alerts // ------------------------- +@alert-padding: 15px; +@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-border-radius: @border-radius-base; @alert-success-bg: @state-success-bg; @alert-success-text: @state-success-text; @@ -500,11 +509,15 @@ // ------------------------- @badge-color: #fff; @badge-link-hover-color: #fff; - @badge-bg: @gray-light; + @badge-active-color: @link-color; @badge-active-bg: #fff; +@badge-font-weight: bold; +@badge-line-height: 1; +@badge-border-radius: 10px; + // Breadcrumbs // ------------------------- @@ -515,12 +528,16 @@ // Carousel // ------------------------ + @carousel-text-shadow: 0 1px 2px rgba(0,0,0,.6); @carousel-control-color: #fff; +@carousel-control-width: 15%; +@carousel-control-opacity: .5; +@carousel-control-font-size: 20px; -@carousel-indicator-border-color: #fff; @carousel-indicator-active-bg: #fff; +@carousel-indicator-border-color: #fff; @carousel-caption-color: #fff; @@ -528,6 +545,7 @@ // Close // ------------------------ @close-color: #000; +@close-font-weight: bold; @close-text-shadow: 0 1px 0 #fff; |