diff options
| author | Mark Otto <[email protected]> | 2015-01-18 12:24:29 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2015-01-18 12:24:29 -0800 |
| commit | 1bf1ba7103cf4de0364dfd8ec78a31eb813d7b8f (patch) | |
| tree | 7a63ae1a434fae8cb51835fafd1b531d5f5da64e /docs/customize.html | |
| parent | dbe47654160d389c6991a312c9cecd2eeb9b6122 (diff) | |
| parent | 22b79dae3c9307c329e6722ff1be8aa0a4143812 (diff) | |
| download | bootstrap-1bf1ba7103cf4de0364dfd8ec78a31eb813d7b8f.tar.xz bootstrap-1bf1ba7103cf4de0364dfd8ec78a31eb813d7b8f.zip | |
Merge branch 'master' into pr/15278
Conflicts:
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
docs/assets/js/customize.min.js
docs/assets/js/raw-files.min.js
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
Diffstat (limited to 'docs/customize.html')
| -rw-r--r-- | docs/customize.html | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/docs/customize.html b/docs/customize.html index 7ba9eb8e0..253cd54f8 100644 --- a/docs/customize.html +++ b/docs/customize.html @@ -25,15 +25,22 @@ lead: Customize Bootstrap's components, Less variables, and jQuery plugins to ge <!-- Customizer form --> +<div id="defaults-change-alert" class="alert alert-warning alert-dismissible" role="alert"> + <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">×</span></button> + <strong>Heads up!</strong> The default value for <code>@brand-primary</code> has changed in the latest release to improve contrast and accessibility. Please double check your compiled CSS when upgrading. +</div> + <div class="bs-docs-section bs-customizer-import"> <div id="import-drop-target" class="bs-dropzone"> - <h2>✍</h2> + <div class="import-header"> + <span class="glyphicon glyphicon-download-alt" aria-hidden="true"></span> + </div> <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 --> +</div> <form class="bs-customizer"> <div class="bs-docs-section" id="less-section"> @@ -370,6 +377,11 @@ lead: Customize Bootstrap's components, Less variables, and jQuery plugins to ge <h1 id="download" class="page-header">Download</h1> <p class="lead">Hooray! Your custom version of Bootstrap is now ready to be compiled. Just click the button below to finish the process.</p> + <div id="firefox-customizer-alert" class="alert alert-warning alert-dismissible fade in" role="alert"> + <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">×</span></button> + <h4>Warning for Firefox users!</h4> + <p>Due to a possible browser bug, the customizer download randomly fails in Firefox. If this happens to you, we advise either retrying in Firefox or using one of the other browsers supported by the Customizer (Chrome or IE10+).</p> + </div> <div class="bs-customize-download"> <button type="submit" id="btn-compile" disabled class="btn btn-block btn-lg btn-outline" onclick="ga('send', 'event', 'Customize', 'Download', 'Customize and Download');">Compile and Download</button> </div> |