github/bootstrap
1
1
Fork 0
mirror of https://github.com/jasny/bootstrap.git synced 2026-04-24 03:00:49 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip

Browse Source
This commit is contained in:
Mark Otto
2013-07-01 17:32:14 -07:00
parent a27ecfccf3 534eac5242
commit 7ad9fbef8b
8 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docs/assets/css/bootstrap.css vendored
View File

@@ -3298,6 +3298,7 @@ button.close {
.pagination {
display: inline-block;
padding-left: 0;
margin: 20px 0;
border-radius: 4px;
}
@@ -3389,6 +3390,7 @@ button.close {
}
.pager {
padding-left: 0;
margin: 20px 0;
text-align: center;
list-style: none;
@@ -4014,7 +4016,7 @@ a.thumbnail:focus {
}
.media-list {
margin-left: 0;
padding-left: 0;
list-style: none;
}