diff options
| author | Mark Otto <[email protected]> | 2013-06-29 17:28:06 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-06-29 17:28:06 -0700 |
| commit | 3b5f4ed054dbf2d05a5fe59cab698a1f7ebd1f18 (patch) | |
| tree | 85b788e82da39bee67f91910be30d491951843ec | |
| parent | 2d2828d36ccaca2f6db42352d59ab4906a7439f6 (diff) | |
| parent | 6a20810ca4970a681bd34274851365af011694e3 (diff) | |
| download | bootstrap-3b5f4ed054dbf2d05a5fe59cab698a1f7ebd1f18.tar.xz bootstrap-3b5f4ed054dbf2d05a5fe59cab698a1f7ebd1f18.zip | |
Merge pull request #8343 from frabrunelle/reset-left-padding
reset left padding for .media-list, .pagination and .pager
| -rw-r--r-- | docs/assets/css/bootstrap.css | 4 | ||||
| -rw-r--r-- | less/media.less | 2 | ||||
| -rw-r--r-- | less/pager.less | 1 | ||||
| -rw-r--r-- | less/pagination.less | 1 |
4 files changed, 6 insertions, 2 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index c76723b99..28f561a32 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -3303,6 +3303,7 @@ button.close { .pagination { display: inline-block; + padding-left: 0; margin: 20px 0; border-radius: 4px; } @@ -3394,6 +3395,7 @@ button.close { } .pager { + padding-left: 0; margin: 20px 0; text-align: center; list-style: none; @@ -4019,7 +4021,7 @@ a.thumbnail:focus { } .media-list { - margin-left: 0; + padding-left: 0; list-style: none; } 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; } |