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

Merge branch '2.2.2-wip' into 3.0.0-wip

Conflicts:
	README.md
	docs/assets/css/bootstrap.css
	docs/assets/js/bootstrap.js
	docs/assets/js/bootstrap.min.js
	docs/examples/fluid.html
	docs/scaffolding.html
	less/breadcrumbs.less
	less/popovers.less
	less/responsive.less
This commit is contained in:
Mark Otto
2012-12-05 11:05:10 -08:00
39 changed files with 279 additions and 354 deletions
+2 -2
View File
@@ -9,7 +9,7 @@
list-style: none;
background-color: #f5f5f5;
border-radius: @border-radius-base;
li {
> li {
display: inline-block;
text-shadow: 0 1px 0 #fff;
&:after {
@@ -19,7 +19,7 @@
color: #ccc;
}
}
.active {
> .active {
color: @grayLight;
}
}