diff options
| author | Jacob Thornton <[email protected]> | 2013-07-23 23:51:18 -0700 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2013-07-23 23:51:18 -0700 |
| commit | 930c75e5dd0f2ae861a505bda740f289570c9b8a (patch) | |
| tree | e55142ec3e404eec83325478691d0626e61b19ef /less/variables.less | |
| parent | 217eb988b8b328369e197e616b3a7adf7b38292c (diff) | |
| parent | 8540515eebf8b17286cb27f6d1804352dada875d (diff) | |
| download | bootstrap-930c75e5dd0f2ae861a505bda740f289570c9b8a.tar.xz bootstrap-930c75e5dd0f2ae861a505bda740f289570c9b8a.zip | |
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Diffstat (limited to 'less/variables.less')
| -rw-r--r-- | less/variables.less | 45 |
1 files changed, 43 insertions, 2 deletions
diff --git a/less/variables.less b/less/variables.less index 7cbda59ac..bf29d3556 100644 --- a/less/variables.less +++ b/less/variables.less @@ -117,6 +117,7 @@ @btn-info-bg: @brand-info; @btn-info-border: @btn-info-bg; +@btn-hover-color: @btn-default-color; // Forms @@ -134,14 +135,18 @@ @input-height-large: (ceil(@font-size-large * @line-height-base) + (@padding-large-vertical * 2) + 2); @input-height-small: (ceil(@font-size-small * @line-height-base) + (@padding-small-vertical * 2) + 2); +@legend-border-color: #e5e5e5; + +@input-group-addon-border-color: @input-border; + // Dropdowns // ------------------------- @dropdown-bg: #fff; @dropdown-border: rgba(0,0,0,.15); -@dropdown-divider-top: #e5e5e5; -@dropdown-divider-bottom: #fff; +@dropdown-fallback-border: #ccc; +@dropdown-divider-bg: #e5e5e5; @dropdown-link-active-color: #fff; @dropdown-link-active-bg: @component-active-bg; @@ -150,6 +155,8 @@ @dropdown-link-hover-color: #fff; @dropdown-link-hover-bg: @dropdown-link-active-bg; +@dropdown-caret-color: #000; + // COMPONENT VARIABLES // -------------------------------------------------- @@ -278,6 +285,9 @@ @label-warning-bg: @brand-warning; @label-danger-bg: @brand-danger; +@label-color: #fff; +@label-link-hover-color: #fff; + // Modals // ------------------------- @@ -327,6 +337,10 @@ @list-group-active-bg: @component-active-bg; @list-group-active-border: @list-group-active-bg; +@list-group-link-color: #555; +@list-group-link-heading-color: #333; + + // Panels // ------------------------- @panel-bg: #fff; @@ -391,6 +405,33 @@ @breadcrumb-active-color: @gray-light; +// Carousel +// ------------------------ +@carousel-text-shadow: 0 1px 2px rgba(0,0,0,.6); + +@carousel-control-color: #fff; + +@carousel-indicator-border-color: #fff; +@carousel-indicator-active-bg: #fff; + +@carousel-caption-color: #fff; + + +// Close +// ------------------------ +@close-color: #000; +@close-text-shadow: 0 1px 0 #fff; + + +// Code +// ------------------------ +@code-color: #c7254e; +@code-bg: #f9f2f4; + +@pre-bg: #f5f5f5; +@pre-border-color: #ccc; + + // Miscellaneous // ------------------------- |