diff options
| author | Mark Otto <[email protected]> | 2014-11-09 23:48:56 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-11-09 23:48:56 -0800 |
| commit | 2cc66cbb5869d2f03407bc9247546c382279f5c0 (patch) | |
| tree | a1c2ac8d5d39adf878d15cf6230ff0df57c9abe1 /docs/_includes | |
| parent | f17b636bce235ada99a8d5b5e845872e2b06bc87 (diff) | |
| parent | c4847c8f6ba39c331e4f0bfcd4f8d02ba4fa2fa6 (diff) | |
| download | bootstrap-2cc66cbb5869d2f03407bc9247546c382279f5c0.tar.xz bootstrap-2cc66cbb5869d2f03407bc9247546c382279f5c0.zip | |
Merge branch 'master' into derp
Conflicts:
dist/css/bootstrap-theme.css
dist/css/bootstrap-theme.css.map
dist/css/bootstrap-theme.min.css
dist/css/bootstrap.css
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
docs/_includes/customizer-variables.html
docs/assets/js/customize.min.js
docs/assets/js/raw-files.min.js
docs/dist/css/bootstrap-theme.css
docs/dist/css/bootstrap-theme.css.map
docs/dist/css/bootstrap-theme.min.css
docs/dist/css/bootstrap.css
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
less/_variables.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 426ab96ce..9de6c5c0d 100644 --- a/docs/_includes/customizer-variables.html +++ b/docs/_includes/customizer-variables.html @@ -31,7 +31,7 @@ <div class="clearfix"></div> <div class="col-xs-4"> <label for="input-@brand-primary">@brand-primary</label> - <input id="input-@brand-primary" type="text" value="darken(#027de7, 3%)" data-var="@brand-primary" class="form-control"/> + <input id="input-@brand-primary" type="text" value="#0275d8" data-var="@brand-primary" class="form-control"/> </div> <div class="col-xs-4"> <label for="input-@brand-success">@brand-success</label> |