rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-01-17 09:52:29 +01:00
Code Issues Actions Packages Releases Activity

fixes #8835: make it so active list group items aren't dependent on an <a> tag

Browse Source
This commit is contained in:
Mark Otto 2013-08-12 01:38:06 -07:00
parent 6dbf588237
commit acdbe73851
3 changed files with 50 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
dist/css/bootstrap.css vendored
View File

@ -2526,16 +2526,6 @@ input[type="button"].btn-block {
margin-right: 5px; margin-right: 5px;
} }
.list-group-item-heading {
margin-top: 0;
margin-bottom: 5px;
}
.list-group-item-text {
margin-bottom: 0;
line-height: 1.3;
}
a.list-group-item .list-group-item-heading { a.list-group-item .list-group-item-heading {
color: #333333; color: #333333;
} }
@ -2550,21 +2540,37 @@ a.list-group-item:focus {
background-color: #f5f5f5; background-color: #f5f5f5;
} }
a.list-group-item.active { .list-group-item.active,
.list-group-item.active:hover,
.list-group-item.active:focus {
z-index: 2; z-index: 2;
color: #ffffff; color: #ffffff;
background-color: #428bca; background-color: #428bca;
border-color: #428bca; border-color: #428bca;
} }
a.list-group-item.active .list-group-item-heading { .list-group-item.active .list-group-item-heading,
.list-group-item.active:hover .list-group-item-heading,
.list-group-item.active:focus .list-group-item-heading {
color: inherit; color: inherit;
} }
a.list-group-item.active .list-group-item-text { .list-group-item.active .list-group-item-text,
.list-group-item.active:hover .list-group-item-text,
.list-group-item.active:focus .list-group-item-text {
color: #e1edf7; color: #e1edf7;
} }
.list-group-item-heading {
margin-top: 0;
margin-bottom: 5px;
}
.list-group-item-text {
margin-bottom: 0;
line-height: 1.3;
}
.panel { .panel {
padding: 15px; padding: 15px;
margin-bottom: 20px; margin-bottom: 20px;

2
dist/css/bootstrap.min.css vendored
View File

File diff suppressed because one or more lines are too long

61
less/list-group.less
View File

@ -39,42 +39,29 @@
> .badge + .badge { > .badge + .badge {
margin-right: 5px; margin-right: 5px;
} }
}
// Custom content options // Linked list items
// ------------------------- a& {
// Colorize content accordingly
.list-group-item-heading {
color: @list-group-link-heading-color;
}
.list-group-item-text {
color: @list-group-link-color;
}
.list-group-item-heading { // Hover state
margin-top: 0; &:hover,
margin-bottom: 5px; &:focus {
} text-decoration: none;
.list-group-item-text { background-color: @list-group-hover-bg;
margin-bottom: 0; }
line-height: 1.3;
}
// Linked list items
// -------------------------
// Custom content within linked items
a.list-group-item {
// Colorize content accordingly
.list-group-item-heading {
color: @list-group-link-heading-color;
}
.list-group-item-text {
color: @list-group-link-color;
}
// Hover state
&:hover,
&:focus {
text-decoration: none;
background-color: @list-group-hover-bg;
} }
// Active class on item itself, not parent // Active class on item itself, not parent
&.active { &.active,
&.active:hover,
&.active:focus {
z-index: 2; // Place active items above their siblings for proper border styling z-index: 2; // Place active items above their siblings for proper border styling
color: @list-group-active-color; color: @list-group-active-color;
background-color: @list-group-active-bg; background-color: @list-group-active-bg;
@ -89,3 +76,15 @@ a.list-group-item {
} }
} }
} }
// Custom content options
// -------------------------
.list-group-item-heading {
margin-top: 0;
margin-bottom: 5px;
}
.list-group-item-text {
margin-bottom: 0;
line-height: 1.3;
}