diff options
| author | Jacob Thornton <[email protected]> | 2012-08-14 21:06:39 -0700 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2012-08-14 21:06:39 -0700 |
| commit | ae9a2bd93a8863eca8346f19a29d55f6c726a156 (patch) | |
| tree | 7e158118727accf105ffda746a280db35d31c2a6 /docs/customize.html | |
| parent | dee57462e2805421a0fe0d786229446bbaef677b (diff) | |
| parent | e1659b2c4ebcd1124665779fe045600207ea7333 (diff) | |
| download | bootstrap-ae9a2bd93a8863eca8346f19a29d55f6c726a156.tar.xz bootstrap-ae9a2bd93a8863eca8346f19a29d55f6c726a156.zip | |
Merge branch '2.1.0-wip' of https://github.com/twitter/bootstrap into 2.1.0-wip
Diffstat (limited to 'docs/customize.html')
| -rw-r--r-- | docs/customize.html | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/docs/customize.html b/docs/customize.html index 422ad43ea..b24685196 100644 --- a/docs/customize.html +++ b/docs/customize.html @@ -190,12 +190,16 @@ <input type="checkbox" checked="true" value="bootstrap-tooltip.js"> Tooltips </label> - </div><!-- /span --> - <div class="span3"> <label class="checkbox"> <input type="checkbox" checked="true" value="bootstrap-popover.js"> Popovers <small>(requires Tooltips)</small> </label> + </div><!-- /span --> + <div class="span3"> + <label class="checkbox"> + <input type="checkbox" checked="true" value="bootstrap-affix.js"> + Affix + </label> <label class="checkbox"> <input type="checkbox" checked="true" value="bootstrap-alert.js"> Alert messages @@ -294,11 +298,11 @@ <label>@monoFontFamily</label> <input type="text" class="span3" placeholder="Menlo, Monaco, 'Courier New', monospace"> <label>@baseFontSize</label> - <input type="text" class="span3" placeholder="13px"> + <input type="text" class="span3" placeholder="14px"> <label>@baseFontFamily</label> <input type="text" class="span3" placeholder="@sansFontFamily"> <label>@baseLineHeight</label> - <input type="text" class="span3" placeholder="18px"> + <input type="text" class="span3" placeholder="20px"> <label>@altFontFamily</label> <input type="text" class="span3" placeholder="@serifFontFamily"> <label>@headingsFontFamily</label> |