diff options
| author | Mark Otto <[email protected]> | 2013-12-11 22:39:03 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-12-11 22:39:03 -0800 |
| commit | 4fc2907723e7f7bb5b14eb5cec94d629b6834e7f (patch) | |
| tree | a9c1df41fbf5f912234f762f03668ea4ef9fd2b7 /customize.html | |
| parent | 0e8baab34ae21c813afb9d8c24b3cb2105aebc46 (diff) | |
| parent | 9966d035cd35c510369286cbb645340bdd6ffc95 (diff) | |
| download | bootstrap-4fc2907723e7f7bb5b14eb5cec94d629b6834e7f.tar.xz bootstrap-4fc2907723e7f7bb5b14eb5cec94d629b6834e7f.zip | |
Merge branch 'master' into docs_derp
Conflicts:
docs-assets/css/docs.css
docs-assets/js/application.js
Diffstat (limited to 'customize.html')
| -rw-r--r-- | customize.html | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/customize.html b/customize.html index 5b15a4c5a..53ed8d710 100644 --- a/customize.html +++ b/customize.html @@ -56,7 +56,7 @@ base_url: "../" </div> <div class="checkbox"> <label> - <input type="checkbox" checked value="buttons.less"> + <input type="checkbox" checked value="buttons.less" data-dependents="button-groups.less"> Buttons </label> </div> @@ -436,7 +436,7 @@ base_url: "../" <div class="row"> <div class="col-lg-6"> <label>@headings-font-family</label> - <input type="text" class="form-control" placeholder="@font-family-base" data-var="@headings-font-family"> + <input type="text" class="form-control" placeholder="inherit" data-var="@headings-font-family"> <label>@headings-font-weight</label> <input type="text" class="form-control" placeholder="500" data-var="@headings-font-weight"> </div> @@ -1056,7 +1056,7 @@ base_url: "../" <p class="help-block">Hovered dropdown menu entry text color</p> <label>@dropdown-link-hover-bg</label> <input type="text" class="form-control" placeholder="#f5f5f5" data-var="@dropdown-link-hover-bg"> - <p class="help-block">Hovered dropdown menu entry text color</p> + <p class="help-block">Hovered dropdown menu entry background color</p> <label>@dropdown-link-active-color</label> <input type="text" class="form-control" placeholder="@component-active-color" data-var="@dropdown-link-active-color"> |