root
/
bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

simplify padding in list groups and margins on badges within

This commit is contained in:
Mark Otto 2013-08-11 21:17:49 -07:00
parent a0f301995c
commit 95affa32e6
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dist/css/bootstrap.css vendored
View File

@ -2334,7 +2334,7 @@ input[type="button"].btn-block {
.list-group-item { .list-group-item {
position: relative; position: relative;
display: block; display: block;
padding: 10px 30px 10px 15px; padding: 10px 15px;
margin-bottom: -1px; margin-bottom: -1px;
background-color: #ffffff; background-color: #ffffff;
border: 1px solid #dddddd; border: 1px solid #dddddd;
@ -2353,11 +2353,10 @@ input[type="button"].btn-block {
.list-group-item > .badge { .list-group-item > .badge {
float: right; float: right;
margin-right: -15px;
} }
.list-group-item > .badge + .badge { .list-group-item > .badge + .badge {
margin-right: 0; margin-right: 5px;
} }
.list-group-item-heading { .list-group-item-heading {

2
dist/css/bootstrap.min.css vendored
View File

File diff suppressed because one or more lines are too long

5
less/list-group.less
View File

@ -17,7 +17,7 @@
.list-group-item { .list-group-item {
position: relative; position: relative;
display: block; display: block;
padding: 10px 30px 10px 15px; padding: 10px 15px;
// Place the border on the list items and negative margin up for better styling // Place the border on the list items and negative margin up for better styling
margin-bottom: -1px; margin-bottom: -1px;
background-color: @list-group-bg; background-color: @list-group-bg;
@ -35,10 +35,9 @@
// Align badges within list items // Align badges within list items
> .badge { > .badge {
float: right; float: right;
margin-right: -15px;
} }
> .badge + .badge { > .badge + .badge {
margin-right: 0; margin-right: 5px;
} }
} }