mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-20 20:00:36 +03:00
Code Activity

Merge branch '2.1.0-wip' of https://github.com/twitter/bootstrap into 2.1.0-wip

Browse Source
This commit is contained in:
Jacob Thornton
2012-08-14 21:06:39 -07:00
parent dee57462e2 e1659b2c4e
commit ae9a2bd93a
19 changed files with 121 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/templates/pages/customize.mustache
Vendored
+8 -4
View File
@@ -119,12 +119,16 @@
<input type="checkbox" checked="true" value="bootstrap-tooltip.js">
{{_i}}Tooltips{{/i}}
</label>
</div><!-- /span -->
<div class="span3">
<label class="checkbox">
<input type="checkbox" checked="true" value="bootstrap-popover.js">
{{_i}}Popovers <small>(requires Tooltips)</small>{{/i}}
</label>
</div><!-- /span -->
<div class="span3">
<label class="checkbox">
<input type="checkbox" checked="true" value="bootstrap-affix.js">
{{_i}}Affix{{/i}}
</label>
<label class="checkbox">
<input type="checkbox" checked="true" value="bootstrap-alert.js">
{{_i}}Alert messages{{/i}}
@@ -223,11 +227,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>