Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip

0bfbf144 · Mark Otto · 8f0bc9e7 · f328ebbc · 0bfbf144 · 0bfbf144
Commit 0bfbf144 authored 12 years ago by Mark Otto
Hide whitespace changes
Inline Side-by-side

Showing

with 3 additions and 0 deletions
+3 -0
--- 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 {

--- 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;
  }