2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-17 19:21:23 +03:00

Merge branch '3.0.0-wip' of https://github.com/cvrebert/bootstrap into cvrebert-3.0.0-wip

Conflicts:
	docs/assets/css/bootstrap.css
	less/mixins.less
This commit is contained in:
Mark Otto
2012-12-19 23:18:02 -08:00
6 changed files with 118 additions and 24 deletions
+1 -1
View File
@@ -415,8 +415,8 @@
&:active,
&.active {
color: @text-color;
background-position: 0 -15px;
background-color: @background-end;
background-position: 0 -15px;
}
&:active,
&.active {