mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-02 16:04:07 +03:00
Code Activity

Merge branch 'master' into derp

Browse Source 
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
This commit is contained in:
Mark Otto
2014-07-12 16:15:45 -07:00
parent f1e77198d4 fe0ef38898
commit 5cfde0d3a5
15 changed files with 65 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/_includes/customizer-variables.html
+1 -1
View File
@@ -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">