1
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-01-17 21:49:09 +01:00

Merge branch 'master' of github.com:twbs/bootstrap

This commit is contained in:
Mark Otto 2013-12-15 13:53:41 -08:00
commit 56eecf97ac
2 changed files with 13 additions and 5 deletions

View File

@ -15,15 +15,15 @@
> span { > span {
display: inline-block; display: inline-block;
padding: 5px 14px; padding: 5px 14px;
background-color: @pagination-bg; background-color: @pager-bg;
border: 1px solid @pagination-border; border: 1px solid @pager-border;
border-radius: @pager-border-radius; border-radius: @pager-border-radius;
} }
> a:hover, > a:hover,
> a:focus { > a:focus {
text-decoration: none; text-decoration: none;
background-color: @pagination-hover-bg; background-color: @pager-hover-bg;
} }
} }
@ -47,7 +47,7 @@
> a:focus, > a:focus,
> span { > span {
color: @pager-disabled-color; color: @pager-disabled-color;
background-color: @pagination-bg; background-color: @pager-bg;
cursor: not-allowed; cursor: not-allowed;
} }
} }

View File

@ -366,8 +366,16 @@
// Pager // Pager
// ------------------------- // -------------------------
@pager-bg: @pagination-bg;
@pager-border: @pagination-border;
@pager-border-radius: 15px; @pager-border-radius: 15px;
@pager-disabled-color: @gray-light;
@pager-hover-bg: @pagination-hover-bg;
@pager-active-bg: @pagination-active-bg;
@pager-active-color: @pagination-active-color;
@pager-disabled-color: @pagination-disabled-color;
// Jumbotron // Jumbotron