root
/
bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge branch '2.2.2-wip' into exploratory

This commit is contained in:
Mark Otto 2012-11-09 10:09:04 -08:00
parent 57eed7867b 54486de88c
commit 1a4ce9ba18
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/base-css.html
View File

@ -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>

2
docs/customize.html
View File

@ -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">

2
docs/templates/pages/base-css.mustache vendored
View File

@ -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>

2
docs/templates/pages/customize.mustache vendored
View File

@ -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">