aboutsummaryrefslogtreecommitdiff
path: root/less
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 /less
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 'less')
-rw-r--r--less/media.less2
-rw-r--r--less/pager.less1
-rw-r--r--less/pagination.less1
3 files changed, 3 insertions, 1 deletions
diff --git a/less/media.less b/less/media.less
index 21063eb2b..bcba8081c 100644
--- a/less/media.less
+++ b/less/media.less
@@ -49,6 +49,6 @@
// Undo default ul/ol styles
.media-list {
- margin-left: 0;
+ padding-left: 0;
list-style: none;
}
diff --git a/less/pager.less b/less/pager.less
index 0b2fcf7cb..007952da0 100644
--- a/less/pager.less
+++ b/less/pager.less
@@ -4,6 +4,7 @@
.pager {
+ padding-left: 0;
margin: @line-height-computed 0;
list-style: none;
text-align: center;
diff --git a/less/pagination.less b/less/pagination.less
index 73c063be0..320387a67 100644
--- a/less/pagination.less
+++ b/less/pagination.less
@@ -3,6 +3,7 @@
// --------------------------------------------------
.pagination {
display: inline-block;
+ padding-left: 0;
margin: @line-height-computed 0;
border-radius: @border-radius-base;
}