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

Merge branch 'master' into pr/11750

Browse Source 
Conflicts:
	dist/css/bootstrap.css
	dist/css/bootstrap.min.css
This commit is contained in:
Mark Otto
2013-12-08 01:45:42 -08:00
parent b92bee99ef 475bbd4d38
commit 12500047f9
46 changed files with 2012 additions and 1028 deletions
Download Patch File Download Diff File Expand all files Collapse all files
less/mixins.less
+28 -1
View File
@@ -437,6 +437,33 @@
}
}
// List Groups
// -------------------------
.list-group-item-variant(@state; @background; @color) {
.list-group-item-@{state} {
color: @color;
background-color: @background;
}
a.list-group-item-@{state} {
color: @color;
.list-group-item-heading { color: inherit; }
&:hover,
&:focus {
color: @color;
background-color: darken(@background, 5%);
}
&.active,
&.active:hover,
&.active:focus {
color: #fff;
background-color: @color;
border-color: @color;
}
}
}
// Button variants
// -------------------------
// Easily pump out default styles, as well as :hover, :focus, :active,
@@ -475,7 +502,7 @@
.badge {
color: @background;
background-color: #fff;
background-color: @color;
}
}