github/bootstrap
1
1
Fork 0
mirror of https://github.com/jasny/bootstrap.git synced 2026-02-13 23:44:58 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'brand-link' of https://github.com/ctalkington/bootstrap into ctalkington-brand-link

Browse Source 
Conflicts:
	docs/assets/bootstrap.zip
This commit is contained in:
Mark Otto
2012-03-22 17:12:22 -07:00
parent fa1b3bdda4 99e96f64f7
commit b59cb505f8
8 changed files with 24 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/templates/pages/download.mustache vendored
View File

@@ -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>