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

Conflicts: dist/css/bootstrap.min.css

Merge branch 'master' of https://github.com/charnog/bootstrap into charnog-master
Conflicts: dist/css/bootstrap.min.css
fc0e7686 · Mark Otto · 705f7ba2 · 4284fc0a · fc0e7686 · fc0e7686
Commit fc0e7686 authored 11 years ago by Mark Otto
Expand all Hide whitespace changes
Inline Side-by-side

Showing

with 5 additions and 1 deletion
+5 -1
--- a/dist/css/bootstrap.css
+++ b/dist/css/bootstrap.css
@@ -4687,6 +4687,8 @@ textarea.input-group-sm > .input-group-btn > .btn {
 }

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

--- a/dist/css/bootstrap.min.css
+++ b/dist/css/bootstrap.min.css
--- a/less/pagination.less
+++ b/less/pagination.less
@@ -58,6 +58,8 @@

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