diff options
| author | Mark Otto <[email protected]> | 2014-03-09 22:01:38 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-03-09 22:01:38 -0700 |
| commit | ccb17f110de8e90773a6ebfda9e35306d625dc78 (patch) | |
| tree | ad1bc7e6bc41eb9805b6a2531c5c37df7a92cb87 /less/variables.less | |
| parent | bdd7651e323a93a4e3d207463451dd374b0a70fa (diff) | |
| parent | b1f71e5292017aca978fabb74d256989e1eeea07 (diff) | |
| download | bootstrap-ccb17f110de8e90773a6ebfda9e35306d625dc78.tar.xz bootstrap-ccb17f110de8e90773a6ebfda9e35306d625dc78.zip | |
Merge branch 'master' into fix-8869
Diffstat (limited to 'less/variables.less')
| -rw-r--r-- | less/variables.less | 27 |
1 files changed, 21 insertions, 6 deletions
diff --git a/less/variables.less b/less/variables.less index 3846adc59..82616ac56 100644 --- a/less/variables.less +++ b/less/variables.less @@ -68,14 +68,18 @@ @headings-color: inherit; -//-- Iconography +//== Iconography // -//## Specify custom locations of the include Glyphicons icon font. Useful for those including Bootstrap via Bower. +//## Specify custom location and filename of the included Glyphicons icon font. Useful for those including Bootstrap via Bower. +//** Load fonts from this directory. @icon-font-path: "../fonts/"; +//** File name for all font files. @icon-font-name: "glyphicons-halflings-regular"; +//** Element ID within SVG icon file. @icon-font-svg-id: "glyphicons_halflingsregular"; + //== Components // //## Define common padding and border radius sizes and more. Values based on 14px text and 1.428 line-height (~20px to start). @@ -558,7 +562,7 @@ //## //** Padding applied to the modal body -@modal-inner-padding: 20px; +@modal-inner-padding: 15px; //** Padding applied to the modal title @modal-title-padding: 15px; @@ -643,17 +647,26 @@ //** List group border radius @list-group-border-radius: @border-radius-base; -//** Background color of single list elements on hover +//** Background color of single list items on hover @list-group-hover-bg: #f5f5f5; -//** Text color of active list elements +//** Text color of active list items @list-group-active-color: @component-active-color; -//** Background color of active list elements +//** Background color of active list items @list-group-active-bg: @component-active-bg; //** Border color of active list elements @list-group-active-border: @list-group-active-bg; +//** Text color for content within active list items @list-group-active-text-color: lighten(@list-group-active-bg, 40%); +//** Text color of disabled list items +@list-group-disabled-color: @gray-light; +//** Background color of disabled list items +@list-group-disabled-bg: @gray-lighter; +//** Text color for content within disabled list items +@list-group-disabled-text-color: @list-group-disabled-color; + @list-group-link-color: #555; +@list-group-link-hover-color: @list-group-link-color; @list-group-link-heading-color: #333; @@ -663,6 +676,8 @@ @panel-bg: #fff; @panel-body-padding: 15px; +@panel-heading-padding: 10px 15px; +@panel-footer-padding: @panel-heading-padding; @panel-border-radius: @border-radius-base; //** Border color for elements within panels |