aboutsummaryrefslogtreecommitdiff
path: root/docs/assets
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-07-01 17:32:14 -0700
committerMark Otto <[email protected]>2013-07-01 17:32:14 -0700
commit7ad9fbef8bd79b7febaaadbd521ea7f60dd2b254 (patch)
tree50ca324dd240d429c9c590c1d50219e813fa0d1d /docs/assets
parenta27ecfccf301f8996d7ddf6bd6f7f46f358a5a31 (diff)
parent534eac52428ca6201ee60e28de2a7a5e949f2144 (diff)
downloadbootstrap-7ad9fbef8bd79b7febaaadbd521ea7f60dd2b254.tar.xz
bootstrap-7ad9fbef8bd79b7febaaadbd521ea7f60dd2b254.zip
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Diffstat (limited to 'docs/assets')
-rw-r--r--docs/assets/css/bootstrap.css4
1 files changed, 3 insertions, 1 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index e721aaa80..1ec4304d6 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -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;
}