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
	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
This commit is contained in:
Mark Otto
2014-11-09 23:48:56 -08:00
parent f17b636bce c4847c8f6b
commit 2cc66cbb58
12 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/_includes/customizer-variables.html
+1 -1
View File
@@ -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>