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

Merge branch '2.3.0-wip' into 3.0.0-wip

Conflicts:
	docs/assets/css/bootstrap-responsive.css
	docs/assets/css/bootstrap.css
	docs/examples/hero.html
	less/buttons.less
	less/carousel.less
	less/close.less
	less/dropdowns.less
	less/labels-badges.less
	less/mixins.less
	less/navbar.less
	less/navs.less
	less/pagination.less
	less/responsive-navbar.less
	less/scaffolding.less
	less/sprites.less
	less/thumbnails.less
	less/type.less
This commit is contained in:
Mark Otto
2013-02-05 19:53:44 -08:00
16 changed files with 61 additions and 4724 deletions
+3 -2
View File
@@ -50,7 +50,8 @@ a {
color: @link-color;
text-decoration: none;
}
a:hover {
a:hover,
a:focus {
color: @link-color-hover;
text-decoration: underline;
}
@@ -153,4 +154,4 @@ img {
h3 {
page-break-after: avoid;
}
}
}