From: Mark Otto Date: Fri, 7 Mar 2014 07:58:04 +0000 (-0800) Subject: Merge pull request #12739 from DaSchTour/twbs X-Git-Tag: v3.2.0~433^2~1^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=901f358d16fb4911141f56f3b8806a367b8454b7;p=thirdparty%2Fbootstrap.git Merge pull request #12739 from DaSchTour/twbs add posibillity to hover links and not background in list-groups --- 901f358d16fb4911141f56f3b8806a367b8454b7 diff --cc less/list-group.less index 9e3b1ef8e8,d645f29005..2514389b1b --- a/less/list-group.less +++ b/less/list-group.less @@@ -62,26 -62,9 +62,27 @@@ a.list-group-item &:hover, &:focus { text-decoration: none; + color: @list-group-link-hover-color; background-color: @list-group-hover-bg; } +} + +.list-group-item { + // Disabled state + &.disabled, + &.disabled:hover, + &.disabled:focus { + background-color: @list-group-disabled-bg; + color: @list-group-disabled-color; + + // Force color to inherit for custom content + .list-group-item-heading { + color: inherit; + } + .list-group-item-text { + color: @list-group-disabled-text-color; + } + } // Active class on item itself, not parent &.active, diff --cc less/variables.less index bdc719cb3f,fcbadd73bc..43d4efd004 --- a/less/variables.less +++ b/less/variables.less @@@ -651,17 -651,10 +651,18 @@@ @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;