Merge branch 'master' of github.com:twbs/bootstrap

This commit is contained in:
Mark Otto 2014-02-08 17:29:25 -08:00
commit 41841c99c4
1 changed files with 1 additions and 4 deletions

View File

@ -165,15 +165,12 @@ ol {
// Inline turns list items into inline-block
.list-inline {
.list-unstyled();
margin-left: -5px;
> li {
display: inline-block;
padding-left: 5px;
padding-right: 5px;
&:first-child {
padding-left: 0;
}
}
}