mirror of
https://github.com/twbs/bootstrap.git
synced 2022-11-09 12:25:43 -05:00
Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip
This commit is contained in:
commit
0bfbf1446d
2 changed files with 3 additions and 0 deletions
2
docs/assets/css/bootstrap.css
vendored
2
docs/assets/css/bootstrap.css
vendored
|
@ -835,8 +835,10 @@ ol.inline {
|
|||
ul.inline > li,
|
||||
ol.inline > li {
|
||||
display: inline-block;
|
||||
*display: inline;
|
||||
padding-right: 5px;
|
||||
padding-left: 5px;
|
||||
*zoom: 1;
|
||||
}
|
||||
|
||||
dl {
|
||||
|
|
|
@ -125,6 +125,7 @@ ol.inline {
|
|||
list-style: none;
|
||||
> li {
|
||||
display: inline-block;
|
||||
.ie7-inline-block();
|
||||
padding-left: 5px;
|
||||
padding-right: 5px;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue