mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-05-24 14:04:09 +03:00
Code Activity

Merge branch 'master' into restore_grid_mixins

Browse Source 
Conflicts:
	dist/css/bootstrap.min.css
This commit is contained in:
Mark Otto
2013-10-13 18:32:34 -07:00
parent a46003b8c7 727a91de1c
commit 265fda7903
39 changed files with 356 additions and 332 deletions
Download Patch File Download Diff File Expand all files Collapse all files
customize.html
-3
View File
@@ -629,9 +629,6 @@ base_url: "../"
<input type="text" class="form-control" placeholder="@brand-info" data-var="@btn-info-bg">
<label>@btn-info-border</label>
<input type="text" class="form-control" placeholder="darken(@btn-info-bg, 5%)" data-var="@btn-info-border">
<h4>Button hover</h4>
<label>@btn-hover-color</label>
<input type="text" class="form-control" placeholder="@btn-default-color" data-var="@btn-hover-color">
</div>
<div class="col-md-6">
<h4>Success</h4>