Commit 1a4ce9ba authored by Mark Otto's avatar Mark Otto

Merge branch '2.2.2-wip' into exploratory

parents 57eed786 54486de8
...@@ -347,7 +347,7 @@ ...@@ -347,7 +347,7 @@
</pre> </pre>
<h3>Unstyled</h3> <h3>Unstyled</h3>
<p>Remove default the <code>list-style</code> and left padding on list items (immediate children only).</p> <p>Remove the default <code>list-style</code> and left padding on list items (immediate children only).</p>
<div class="bs-docs-example"> <div class="bs-docs-example">
<ul class="list-unstyled"> <ul class="list-unstyled">
<li>Lorem ipsum dolor sit amet</li> <li>Lorem ipsum dolor sit amet</li>
......
...@@ -366,7 +366,7 @@ ...@@ -366,7 +366,7 @@
<label>@btnPrimaryBackground</label> <label>@btnPrimaryBackground</label>
<input type="text" class="span3" placeholder="@linkColor"> <input type="text" class="span3" placeholder="@linkColor">
<label>@btnPrimaryBackgroundHighlight</label> <label>@btnPrimaryBackgroundHighlight</label>
<input type="text" class="span3" placeholder="darken(@white, 10%);"> <input type="text" class="span3" placeholder="darken(@white, 10%)">
</div><!-- /span --> </div><!-- /span -->
<div class="span3"> <div class="span3">
......
...@@ -287,7 +287,7 @@ ...@@ -287,7 +287,7 @@
</pre> </pre>
<h3>{{_i}}Unstyled{{/i}}</h3> <h3>{{_i}}Unstyled{{/i}}</h3>
<p>{{_i}}Remove default the <code>list-style</code> and left padding on list items (immediate children only).{{/i}}</p> <p>{{_i}}Remove the default <code>list-style</code> and left padding on list items (immediate children only).{{/i}}</p>
<div class="bs-docs-example"> <div class="bs-docs-example">
<ul class="list-unstyled"> <ul class="list-unstyled">
<li>Lorem ipsum dolor sit amet</li> <li>Lorem ipsum dolor sit amet</li>
......
...@@ -298,7 +298,7 @@ ...@@ -298,7 +298,7 @@
<label>@btnPrimaryBackground</label> <label>@btnPrimaryBackground</label>
<input type="text" class="span3" placeholder="@linkColor"> <input type="text" class="span3" placeholder="@linkColor">
<label>@btnPrimaryBackgroundHighlight</label> <label>@btnPrimaryBackgroundHighlight</label>
<input type="text" class="span3" placeholder="darken(@white, 10%);"> <input type="text" class="span3" placeholder="darken(@white, 10%)">
</div><!-- /span --> </div><!-- /span -->
<div class="span3"> <div class="span3">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment