mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-05-21 13:24:08 +03:00
Code 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
parent 705f7ba279 4284fc0a5e
commit fc0e7686fb
3 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dist/css/bootstrap.css
Vendored
+2
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 {