diff options
| author | Mark Otto <[email protected]> | 2014-07-12 16:15:45 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-07-12 16:15:45 -0700 |
| commit | 5cfde0d3a5819374e5f750b4fcfedfccc5c19889 (patch) | |
| tree | 54414858a401502baad20cc62a62db5f3f2ee242 /docs/_includes | |
| parent | f1e77198d4ecbc49013e0f011b381459d47d6315 (diff) | |
| parent | fe0ef388982399d8925ec7aa8a70c4b4df3aa7e6 (diff) | |
| download | bootstrap-5cfde0d3a5819374e5f750b4fcfedfccc5c19889.tar.xz bootstrap-5cfde0d3a5819374e5f750b4fcfedfccc5c19889.zip | |
Merge branch 'master' into derp
Conflicts:
dist/css/bootstrap-theme.css.map
dist/css/bootstrap.css
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
docs/assets/js/customize.min.js
docs/dist/css/bootstrap-theme.css.map
docs/dist/css/bootstrap.css
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
docs/javascript/dropdowns.md
less/utilities.less
Diffstat (limited to 'docs/_includes')
| -rw-r--r-- | docs/_includes/customizer-variables.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/_includes/customizer-variables.html b/docs/_includes/customizer-variables.html index 700472a4b..aa4dd4f3e 100644 --- a/docs/_includes/customizer-variables.html +++ b/docs/_includes/customizer-variables.html @@ -408,7 +408,7 @@ </div> <div class="bs-customizer-input"> <label for="input-@input-color-placeholder">@input-color-placeholder</label> - <input id="input-@input-color-placeholder" type="text" value="@gray-light" data-var="@input-color-placeholder" class="form-control"/> + <input id="input-@input-color-placeholder" type="text" value="#999" data-var="@input-color-placeholder" class="form-control"/> <p class="help-block">Placeholder text color</p> </div> <div class="bs-customizer-input"> |