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 -1
View File
@@ -20,6 +20,7 @@
border-left-width: 0;
}
.pagination > li > a:hover,
.pagination > li > a:focus,
.pagination > .active > a,
.pagination > .active > span {
background-color: @pagination-background-active;
@@ -31,7 +32,8 @@
}
.pagination > .disabled > span,
.pagination > .disabled > a,
.pagination > .disabled > a:hover {
.pagination > .disabled > a:hover,
.pagination > .disabled > a:focus {
color: @grayLight;
background-color: transparent;
cursor: default;