diff options
| author | Mark Otto <[email protected]> | 2013-12-15 13:53:41 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-12-15 13:53:41 -0800 |
| commit | 56eecf97ac21e5b6111563f726ad7860cd76f0f0 (patch) | |
| tree | 06786cb3ef3b8fdf5fe1c5932241fda59654cefb | |
| parent | ee80b5e1d4d36f37ec0408bbe2af7e4c2e5cb0d5 (diff) | |
| parent | f126411735dc00c72c4c8cb7421852eb1652255a (diff) | |
| download | bootstrap-56eecf97ac21e5b6111563f726ad7860cd76f0f0.tar.xz bootstrap-56eecf97ac21e5b6111563f726ad7860cd76f0f0.zip | |
Merge branch 'master' of github.com:twbs/bootstrap
| -rw-r--r-- | less/pager.less | 8 | ||||
| -rw-r--r-- | less/variables.less | 10 |
2 files changed, 13 insertions, 5 deletions
diff --git a/less/pager.less b/less/pager.less index 5205f0ee5..59103f445 100644 --- a/less/pager.less +++ b/less/pager.less @@ -15,15 +15,15 @@ > span { display: inline-block; padding: 5px 14px; - background-color: @pagination-bg; - border: 1px solid @pagination-border; + background-color: @pager-bg; + border: 1px solid @pager-border; border-radius: @pager-border-radius; } > a:hover, > a:focus { text-decoration: none; - background-color: @pagination-hover-bg; + background-color: @pager-hover-bg; } } @@ -47,7 +47,7 @@ > a:focus, > span { color: @pager-disabled-color; - background-color: @pagination-bg; + background-color: @pager-bg; cursor: not-allowed; } } diff --git a/less/variables.less b/less/variables.less index faccd927c..4c7de2a3d 100644 --- a/less/variables.less +++ b/less/variables.less @@ -366,8 +366,16 @@ // Pager // ------------------------- +@pager-bg: @pagination-bg; +@pager-border: @pagination-border; @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 |