diff options
| author | fat <[email protected]> | 2012-10-29 21:55:07 -0700 |
|---|---|---|
| committer | fat <[email protected]> | 2012-10-29 21:55:07 -0700 |
| commit | 68cfedb34af198f178128f8c9bc8ea164e44304a (patch) | |
| tree | dae0d245988b472abd30a4f968b919d0019b6c70 /docs/customize.html | |
| parent | f1136228a789c6c0853771097f6292a478a056aa (diff) | |
| parent | bf10a43ed91abc41fb6062811a2b1c4ed73c5094 (diff) | |
| download | bootstrap-68cfedb34af198f178128f8c9bc8ea164e44304a.tar.xz bootstrap-68cfedb34af198f178128f8c9bc8ea164e44304a.zip | |
Merge branch '2.1.2-wip' of github.com:twitter/bootstrap into 2.1.2-wip
Diffstat (limited to 'docs/customize.html')
| -rw-r--r-- | docs/customize.html | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/docs/customize.html b/docs/customize.html index 2377c9b93..30be36ee1 100644 --- a/docs/customize.html +++ b/docs/customize.html @@ -133,6 +133,7 @@ <label class="checkbox"><input checked="checked" type="checkbox" value="alerts.less"> Alerts</label> <label class="checkbox"><input checked="checked" type="checkbox" value="progress-bars.less"> Progress bars</label> <label class="checkbox"><input checked="checked" type="checkbox" value="hero-unit.less"> Hero unit</label> + <label class="checkbox"><input checked="checked" type="checkbox" value="media.less"> Media component</label> <h3>JS Components</h3> <label class="checkbox"><input checked="checked" type="checkbox" value="tooltip.less"> Tooltips</label> <label class="checkbox"><input checked="checked" type="checkbox" value="popovers.less"> Popovers</label> @@ -298,12 +299,14 @@ <input type="text" class="span3" placeholder="Georgia, 'Times New Roman', Times, serif"> <label>@monoFontFamily</label> <input type="text" class="span3" placeholder="Menlo, Monaco, 'Courier New', monospace"> + <label>@baseFontSize</label> <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="20px"> + <label>@altFontFamily</label> <input type="text" class="span3" placeholder="@serifFontFamily"> <label>@headingsFontFamily</label> @@ -312,6 +315,28 @@ <input type="text" class="span3" placeholder="bold"> <label>@headingsColor</label> <input type="text" class="span3" placeholder="inherit"> + + <label>@fontSizeLarge</label> + <input type="text" class="span3" placeholder="@baseFontSize * 1.25"> + <label>@fontSizeSmall</label> + <input type="text" class="span3" placeholder="@baseFontSize * 0.85"> + <label>@fontSizeMini</label> + <input type="text" class="span3" placeholder="@baseFontSize * 0.75"> + + <label>@paddingLarge</label> + <input type="text" class="span3" placeholder="11px 19px"> + <label>@paddingSmall</label> + <input type="text" class="span3" placeholder="2px 10px"> + <label>@paddingMini</label> + <input type="text" class="span3" placeholder="1px 6px"> + + <label>@baseBorderRadius</label> + <input type="text" class="span3" placeholder="4px"> + <label>@borderRadiusLarge</label> + <input type="text" class="span3" placeholder="6px"> + <label>@borderRadiusSmall</label> + <input type="text" class="span3" placeholder="3px"> + <label>@heroUnitBackground</label> <input type="text" class="span3" placeholder="@grayLighter"> <label>@heroUnitHeadingColor</label> @@ -398,6 +423,11 @@ <label>@navbarSearchPlaceholderColor</label> <input type="text" class="span3" placeholder="#ccc"> + <label>@navbarCollapseWidth</label> + <input type="text" class="span3" placeholder="979px"> + <label>@navbarCollapseDesktopWidth</label> + <input type="text" class="span3" placeholder="@navbarCollapseWidth + 1"> + <h3>Dropdowns</h3> <label>@dropdownBackground</label> <input type="text" class="span3" placeholder="@white"> |