diff options
| author | Mark Otto <[email protected]> | 2013-12-18 10:22:18 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-12-18 10:22:18 -0800 |
| commit | 1bc8607bdffe641d58191084b214138a98aba229 (patch) | |
| tree | ffb2855b592ee37c5068da181a4c3fb335a322da /docs-assets/js/customizer.js | |
| parent | 9e38e255343a4fd5fa2fa932c96be9cb5c902337 (diff) | |
| parent | d15218a09ce68d0854d0aa5f5170c1ea859aee31 (diff) | |
| download | bootstrap-1bc8607bdffe641d58191084b214138a98aba229.tar.xz bootstrap-1bc8607bdffe641d58191084b214138a98aba229.zip | |
Merge branch 'master' into css-source-maps
Conflicts:
Gruntfile.js
Diffstat (limited to 'docs-assets/js/customizer.js')
| -rw-r--r-- | docs-assets/js/customizer.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs-assets/js/customizer.js b/docs-assets/js/customizer.js index cfc7010b0..b6e78bd2b 100644 --- a/docs-assets/js/customizer.js +++ b/docs-assets/js/customizer.js @@ -232,7 +232,7 @@ window.onload = function () { // wait for load in a dumb way because B-0 } result = { 'bootstrap.css' : cw + tree.toCSS(), - 'bootstrap.min.css' : cw + tree.toCSS({ compress: true }).replace(/\n/g, '') // FIXME: remove newline hack once less.js upgraded to v1.4 + 'bootstrap.min.css' : cw + tree.toCSS({ compress: true }) } }) } catch (err) { |