Refactor .list-inline and .list-unstyled

* Instead of shared and separate CSS, isolate by class for easier mixin-ability
* .list-unstyled is now used as a mixin in .list-inline

diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 5632d3aaddf4f978adb0a2aa9fb9f868dd7082e5..50d2070015737d844c0a3f1c1d94eba2a4584e02 100644 (file)
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -546,7 +546,11 @@ li {
   line-height: 20px;
 }
 
-.list-unstyled,
+.list-unstyled {
+  margin-left: 0;
+  list-style: none;
+}
+
 .list-inline {
   margin-left: 0;
   list-style: none;

diff --git a/less/type.less b/less/type.less
index 193078c72c3e940c7408d365453dab4c161c550b..60ad793e9089beeceb756de4f30e179f1f799fee 100644 (file)
--- a/less/type.less
+++ b/less/type.less
@@ -126,18 +126,20 @@ li {
 }
 
 // List options
+
 // Unstyled keeps list items block level, just removes list-style
-.list-unstyled,
-// Inline turns list items into inline-block
-.list-inline {
+.list-unstyled {
   margin-left: 0;
   list-style: none;
 }
-// Single-line list items
-.list-inline > li {
-  display: inline-block;
-  padding-left: 5px;
-  padding-right: 5px;
+// Inline turns list items into inline-block
+.list-inline {
+  .list-unstyled();
+  > li {
+    display: inline-block;
+    padding-left: 5px;
+    padding-right: 5px;
+  }
 }
 
 // Description Lists