Merge branch '2.2.2-wip' into exploratory

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

2 files changed, 11 insertions, 15 deletions

diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 2860d3300..61b2b03a7 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -544,12 +544,9 @@ li {
   line-height: 20px;
 }
 
-.list-unstyled {
-  margin-left: 0;
-  list-style: none;
-}
-
+.list-unstyled,
 .list-inline {
+  margin-left: 0;
   list-style: none;
 }
 
diff --git a/less/type.less b/less/type.less
index eded998fb..ec1c40ed7 100644
--- a/less/type.less
+++ b/less/type.less
@@ -106,20 +106,19 @@ li {
   line-height: @baseLineHeight;
 }
 
-// Remove default list styles
-.list-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 {
-  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