diff options
| author | Mark Otto <[email protected]> | 2013-02-01 21:44:35 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-02-01 21:44:35 -0800 |
| commit | 0bfbf1446d853e5edb066acb68bcf3eb995b47b3 (patch) | |
| tree | 9e733c6dbdc376041ac0706e81d797ceb6b35748 | |
| parent | 8f0bc9e79ba2fee466a100995a9fe9deca03a226 (diff) | |
| parent | f328ebbc73c31c4b934e6399e2f4997caa834d15 (diff) | |
| download | bootstrap-0bfbf1446d853e5edb066acb68bcf3eb995b47b3.tar.xz bootstrap-0bfbf1446d853e5edb066acb68bcf3eb995b47b3.zip | |
Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip
| -rw-r--r-- | docs/assets/css/bootstrap.css | 2 | ||||
| -rw-r--r-- | less/type.less | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index c0c5ac91e..ca9c699b6 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -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 { diff --git a/less/type.less b/less/type.less index 9afff93ac..7eabfd9ad 100644 --- a/less/type.less +++ b/less/type.less @@ -125,6 +125,7 @@ ol.inline { list-style: none; > li { display: inline-block; + .ie7-inline-block(); padding-left: 5px; padding-right: 5px; } |