diff options
author | Mark Otto <otto@github.com> | 2014-08-03 05:30:59 +0400 |
---|---|---|
committer | Mark Otto <otto@github.com> | 2014-08-03 05:30:59 +0400 |
commit | 089d434895fbe901d838e4dfb29cdb5941c47ab6 (patch) | |
tree | dac25fa32c4420bfb3b1199c61898f04b71eaebe /docs/customize.html | |
parent | f200c39657c5011e12bace716c59b2242d48c077 (diff) | |
parent | 033f1654b07f7764a54e5b290e5cf36f688b95a3 (diff) |
Merge branch 'master' into derp
Conflicts:
_config.yml
dist/css/bootstrap-theme.css.map
dist/css/bootstrap.css
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
docs/_includes/components/glyphicons.html
docs/_includes/css/forms.html
docs/_includes/css/tables.html
docs/_includes/getting-started/browser-device-support.html
docs/_includes/header.html
docs/_includes/js/affix.html
docs/_includes/js/alerts.html
docs/_includes/js/buttons.html
docs/_includes/js/dropdowns.html
docs/_includes/js/overview.html
docs/_includes/js/popovers.html
docs/_includes/js/tooltips.html
docs/_includes/nav/javascript.html
docs/assets/css/docs.min.css
docs/assets/css/src/docs.css
docs/assets/js/customize.min.js
docs/assets/js/docs.min.js
docs/assets/js/raw-files.min.js
docs/browser-bugs.html
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/examples/blog/index.html
docs/examples/carousel/index.html
docs/examples/cover/index.html
docs/examples/dashboard/index.html
docs/examples/grid/index.html
docs/examples/jumbotron-narrow/index.html
docs/examples/jumbotron/index.html
docs/examples/justified-nav/index.html
docs/examples/navbar-fixed-top/index.html
docs/examples/navbar-static-top/index.html
docs/examples/navbar/index.html
docs/examples/non-responsive/index.html
docs/examples/offcanvas/index.html
docs/examples/signin/index.html
docs/examples/starter-template/index.html
docs/examples/sticky-footer-navbar/index.html
docs/examples/sticky-footer/index.html
docs/examples/theme/index.html
docs/examples/tooltip-viewport/index.html
less/code.less
less/panels.less
less/variables.less
Diffstat (limited to 'docs/customize.html')
-rw-r--r-- | docs/customize.html | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/docs/customize.html b/docs/customize.html index 7300a03a0f..66a5153caf 100644 --- a/docs/customize.html +++ b/docs/customize.html @@ -12,6 +12,7 @@ lead: Customize Bootstrap's components, Less variables, and jQuery plugins to ge <!--[if lt IE 9]> <style> .bs-customizer, + .bs-customizer-import, .bs-docs-sidebar { display: none; } @@ -23,6 +24,17 @@ lead: Customize Bootstrap's components, Less variables, and jQuery plugins to ge <![endif]--> <!-- Customizer form --> + +<div class="bs-docs-section bs-customizer-import"> + <div id="import-drop-target" class="bs-dropzone"> + <h2>✍</h2> + <p class="lead">Have an existing configuration? Upload your <code>config.json</code> to import it.</p> + <p>Drag and drop here, or <label id="import-manual-trigger" class="btn-link">manually upload<input type="file" id="import-file-select" class="hidden"></label>.</p> + <hr> + <p><strong>Don't have one?</strong> That's okay—just start customizing the fields below.</p> + </div> +</div><!-- /import --> + <form class="bs-customizer" role="form"> <div class="bs-docs-section" id="less-section"> <button class="btn btn-secondary toggle" type="button">Toggle all</button> @@ -358,8 +370,6 @@ lead: Customize Bootstrap's components, Less variables, and jQuery plugins to ge {% include customizer-variables.html %} </div> - - <div class="bs-docs-section"> <h1 id="download" class="page-header">Download</h1> |