From: Mark Otto <otto@github.com>
Date: Sun, 4 Nov 2012 20:42:00 +0000 (-0800)
Subject: Merge branch '2.2.2-wip' into exploratory
X-Git-Tag: v3.0.0-rc1~891
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1af0021014a1c50ac02facd23a36dfc8f74cd143;p=thirdparty%2Fbootstrap.git

Merge branch '2.2.2-wip' into exploratory

Conflicts:
	docs/assets/css/bootstrap.css
	less/type.less
---

1af0021014a1c50ac02facd23a36dfc8f74cd143
diff --cc docs/assets/css/bootstrap.css
index 2860d33002,a5a1ca4a33..61b2b03a7e
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@@ -544,12 -808,15 +544,9 @@@ li 
    line-height: 20px;
  }
  
- .list-unstyled {
 -ul.unstyled,
 -ol.unstyled {
--  margin-left: 0;
--  list-style: none;
--}
--
 -ul.inline,
 -ol.inline {
++.list-unstyled,
 +.list-inline {
+   margin-left: 0;
    list-style: none;
  }
  
diff --cc less/type.less
index eded998fb2,683a307726..ec1c40ed77
--- a/less/type.less
+++ b/less/type.less
@@@ -106,20 -107,23 +106,19 @@@ li 
    line-height: @baseLineHeight;
  }
  
--// Remove default list styles
- .list-unstyled {
 -ul.unstyled,
 -ol.unstyled {
++// List options
++// Unstyled keeps list items block level, just removes list-style
++.list-unstyled,
++// Inline turns list items into inline-block
++.list-inline {
    margin-left: 0;
    list-style: none;
  }
--
  // Single-line list items
- .list-inline {
 -ul.inline,
 -ol.inline {
 -  margin-left: 0;
--  list-style: none;
--  & > li {
--    display: inline-block;
--    padding-left: 5px;
--    padding-right: 5px;
--  }
++.list-inline > li {
++  display: inline-block;
++  padding-left: 5px;
++  padding-right: 5px;
  }
  
  // Description Lists