rev/bootstrap
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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