mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-09-30 15:29:06 +02:00
Code Issues Releases Wiki Activity

Merge branch 'master' into rtl_via_css_flip

Browse Source 
Conflicts:
	docs/assets/js/raw-files.min.js
This commit is contained in:
Mark Otto
2014-03-04 00:41:57 -08:00
parent 477dc99ffa 1399497a02
commit d6e07f045c
7 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
docs/_includes/customizer-variables.html
View File

@@ -1352,6 +1352,14 @@
<label for="input-@panel-body-padding">@panel-body-padding</label>
<input id="input-@panel-body-padding" type="text" value="15px" data-var="@panel-body-padding" class="form-control"/>
</div>
<div class="bs-customizer-input">
<label for="input-@panel-heading-padding">@panel-heading-padding</label>
<input id="input-@panel-heading-padding" type="text" value="10px 15px" data-var="@panel-heading-padding" class="form-control"/>
</div>
<div class="bs-customizer-input">
<label for="input-@panel-footer-padding">@panel-footer-padding</label>
<input id="input-@panel-footer-padding" type="text" value="@panel-heading-padding" data-var="@panel-footer-padding" class="form-control"/>
</div>
<div class="bs-customizer-input">
<label for="input-@panel-border-radius">@panel-border-radius</label>
<input id="input-@panel-border-radius" type="text" value="@border-radius-base" data-var="@panel-border-radius" class="form-control"/>

2
docs/assets/js/customize.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
docs/assets/js/raw-files.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
docs/dist/css/bootstrap.css.map vendored
View File

File diff suppressed because one or more lines are too long