Skip to content

B
bootstrap
Commit fc0e7686 authored by Mark Otto's avatar Mark Otto
Browse files
Options

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

Conflicts:
	dist/css/bootstrap.min.css
parents 705f7ba2 4284fc0a
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 1 deletion
dist/css/bootstrap.css
View file @ fc0e7686
...@@ -4687,6 +4687,8 @@ textarea.input-group-sm > .input-group-btn > .btn { ...@@ -4687,6 +4687,8 @@ textarea.input-group-sm > .input-group-btn > .btn {
} }
.pagination > .disabled > span, .pagination > .disabled > span,
.pagination > .disabled > span:hover,
.pagination > .disabled > span:focus,
.pagination > .disabled > a, .pagination > .disabled > a,
.pagination > .disabled > a:hover, .pagination > .disabled > a:hover,
.pagination > .disabled > a:focus { .pagination > .disabled > a:focus {
......
dist/css/bootstrap.min.css
View file @ fc0e7686
This source diff could not be displayed because it is too large. You can view the blob instead.
less/pagination.less
View file @ fc0e7686
...@@ -58,6 +58,8 @@ ...@@ -58,6 +58,8 @@
> .disabled { > .disabled {
> span, > span,
> span:hover,
> span:focus,
> a, > a,
> a:hover, > a:hover,
> a:focus { > a:focus {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment