clones/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-09-24 03:57:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	dist/css/bootstrap.min.css
This commit is contained in:
Mark Otto 2013-08-23 23:40:12 -07:00
commit fc0e7686fb
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dist/css/bootstrap.css vendored
View File

@ -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 {

2
dist/css/bootstrap.min.css vendored
View File

File diff suppressed because one or more lines are too long

2
less/pagination.less
View File

@ -58,6 +58,8 @@
> .disabled {
> span,
> span:hover,
> span:focus,
> a,
> a:hover,
> a:focus {