Merge branch 'master' of https://github.com/charnog/bootstrap into charnog-master

Conflicts: dist/css/bootstrap.min.css
2013-08-23 23:40:12 -07:00 · 2013-08-23 23:40:12 -07:00 · fc0e7686fb
commit fc0e7686fb
parent 705f7ba279 4284fc0a5e
3 changed files with 5 additions and 1 deletions
--- a/less/pagination.less
+++ b/less/pagination.less
@ -58,6 +58,8 @@

  > .disabled {
    > span,
+    > span:hover,
+    > span:focus,
    > a,
    > a:hover,
    > a:focus {