mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-14 18:42:30 +03:00
Code Activity

Merge branch 'master' into pr/12490

Browse Source 
Conflicts:
	less/list-group.less
This commit is contained in:
Mark Otto
2014-03-06 21:32:52 -08:00
parent d1a7271ea1 fab10b643e
commit c8614c0f15
170 changed files with 13561 additions and 6507 deletions
Download Patch File Download Diff File Expand all files Collapse all files
less/list-group.less
+4 -2
View File
@@ -64,7 +64,9 @@ a.list-group-item {
text-decoration: none;
background-color: @list-group-hover-bg;
}
}
.list-group-item {
// Disabled state
&.disabled,
&.disabled:hover,
@@ -72,7 +74,7 @@ a.list-group-item {
background-color: @list-group-disabled-bg;
color: @list-group-disabled-color;
border-color: @list-group-disabled-border;
// Force color to inherit for custom content
.list-group-item-heading {
color: inherit;