diff options
| author | Mark Otto <[email protected]> | 2012-03-22 17:12:22 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-03-22 17:12:22 -0700 |
| commit | b59cb505f8cf4e0010f422f0a83d9c001055cbd7 (patch) | |
| tree | 334b36865d127c338432137bb9cbdab2ebaa70a9 /docs/templates | |
| parent | fa1b3bdda479e4c419826e2e56fcddb90d6c3519 (diff) | |
| parent | 99e96f64f7dbaba8c83d7d69e64247969765b9e8 (diff) | |
| download | bootstrap-b59cb505f8cf4e0010f422f0a83d9c001055cbd7.tar.xz bootstrap-b59cb505f8cf4e0010f422f0a83d9c001055cbd7.zip | |
Merge branch 'brand-link' of https://github.com/ctalkington/bootstrap into ctalkington-brand-link
Conflicts:
docs/assets/bootstrap.zip
Diffstat (limited to 'docs/templates')
| -rw-r--r-- | docs/templates/pages/download.mustache | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/docs/templates/pages/download.mustache b/docs/templates/pages/download.mustache index 87fdc6a38..c7f6cfab8 100644 --- a/docs/templates/pages/download.mustache +++ b/docs/templates/pages/download.mustache @@ -259,6 +259,8 @@ <input type="text" class="span3" placeholder="darken(@navbarSearchBackground, 30%)"> <label>@navbarSearchPlaceholderColor</label> <input type="text" class="span3" placeholder="#ccc"> + <label>@navbarBrandColor</label> + <input type="text" class="span3" placeholder="@navbarLinkColor"> <h3>{{_i}}Dropdowns{{/i}}</h3> <label>@dropdownBackground</label> |