From 3663e3700540e08e9168d4066dc17b97554d9732 Mon Sep 17 00:00:00 2001 From: Ross Allen Date: Mon, 23 Sep 2013 23:29:45 -0700 Subject: Use bootstrap.less file order in Customizer Appending stylesheets by iterating the `__less` Hash creates an order that is not the same as 'bootstrap.less'. Some stylesheets like 'component-animations.less' and 'modals.less' have selectors with matching specificity, and so file order decides which style wins. This causes issue #10030 by putting `.fade.in` after `.modal-backdrop.in` and gives the backdrop a higher opacity than intended. This change uses the Less ordering in 'bootstrap.less' to generate the final stylesheets in the Customizer to make sure customized file ordering matches the distribution file order. Fixes #10030 --- docs-assets/js/customizer.js | 48 ++++++++++++++++++++++++++++++++++---------- 1 file changed, 37 insertions(+), 11 deletions(-) (limited to 'docs-assets/js/customizer.js') diff --git a/docs-assets/js/customizer.js b/docs-assets/js/customizer.js index 5abfe4228..08c8bfb60 100644 --- a/docs-assets/js/customizer.js +++ b/docs-assets/js/customizer.js @@ -155,10 +155,32 @@ window.onload = function () { // wait for load in a dumb way because B-0 } } + // Returns an Array of @import'd filenames from 'bootstrap.less' in the order + // in which they appear in the file. + function bootstrapLessFilenames() { + var IMPORT_REGEX = /^@import \"(.*?)\";$/ + var bootstrapLessLines = __less['bootstrap.less'].split('\n') + + for (var i = 0, imports = []; i < bootstrapLessLines.length; i++) { + var match = IMPORT_REGEX.exec(bootstrapLessLines[i]) + if (match) imports.push(match[1]) + } + + return imports + } + function generateCSS() { - var $checked = $('#less-section input:checked') + var oneChecked = false + var lessFileIncludes = {} + $('#less-section input').each(function() { + var $this = $(this) + var checked = $this.is(':checked') + lessFileIncludes[$this.val()] = checked + + oneChecked = oneChecked || checked + }) - if (!$checked.length) return false + if (!oneChecked) return false var result = {} var vars = {} @@ -169,15 +191,19 @@ window.onload = function () { // wait for load in a dumb way because B-0 $(this).val() && (vars[ $(this).prev().text() ] = $(this).val()) }) - css += __less['variables.less'] - if (vars) css += generateCustomCSS(vars) - css += __less['mixins.less'] - css += __less['normalize.less'] - css += __less['scaffolding.less'] - css += $checked - .map(function () { return __less[this.value] }) - .toArray() - .join('\n') + $.each(bootstrapLessFilenames(), function(index, filename) { + var fileInclude = lessFileIncludes[filename] + + // Files not explicitly unchecked are compiled into the final stylesheet. + // Core stylesheets like 'normalize.less' are not included in the form + // since disabling them would wreck everything, and so their 'fileInclude' + // will be 'undefined'. + if (fileInclude || (fileInclude == null)) css += __less[filename] + + // Custom variables are added after Bootstrap variables so the custom + // ones take precedence. + if (('variables.less' === filename) && vars) css += generateCustomCSS(vars) + }) css = css.replace(/@import[^\n]*/gi, '') //strip any imports -- cgit v1.2.3 From 58a47b6bfd274e7018316c0ea77ce0ca40a7e53f Mon Sep 17 00:00:00 2001 From: "Stuart P. Bentley" Date: Sat, 14 Sep 2013 04:26:42 -0400 Subject: Customizer: include config.json in bootstrap.zip merges #10633; fixes part of #9951 --- docs-assets/js/customizer.js | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'docs-assets/js/customizer.js') diff --git a/docs-assets/js/customizer.js b/docs-assets/js/customizer.js index 5abfe4228..cc772d222 100644 --- a/docs-assets/js/customizer.js +++ b/docs-assets/js/customizer.js @@ -31,13 +31,13 @@ window.onload = function () { // wait for load in a dumb way because B-0 return match && decodeURIComponent(match[1].replace(/\+/g, " ")); } - function createGist(configData) { + function createGist(configJson) { var data = { "description": "Bootstrap Customizer Config", "public": true, "files": { "config.json": { - "content": JSON.stringify(configData, null, 2) + "content": configJson } } } @@ -107,7 +107,7 @@ window.onload = function () { // wait for load in a dumb way because B-0 }) } - function generateZip(css, js, fonts, complete) { + function generateZip(css, js, fonts, config, complete) { if (!css && !js) return showError('Ruh roh! No Bootstrap files selected.', new Error('no Bootstrap')) var zip = new JSZip() @@ -133,6 +133,10 @@ window.onload = function () { // wait for load in a dumb way because B-0 } } + if (config) { + zip.file('config.json', config) + } + var content = zip.generate({type:"blob"}) complete(content) @@ -262,14 +266,17 @@ window.onload = function () { // wait for load in a dumb way because B-0 var $downloadBtn = $('#btn-download') $compileBtn.on('click', function (e) { + var configData = getCustomizerData() + var configJson = JSON.stringify(configData, null, 2) + e.preventDefault() $compileBtn.attr('disabled', 'disabled') - generateZip(generateCSS(), generateJavascript(), generateFonts(), function (blob) { + generateZip(generateCSS(), generateJavascript(), generateFonts(), configJson, function (blob) { $compileBtn.removeAttr('disabled') saveAs(blob, "bootstrap.zip") - createGist(getCustomizerData()) + createGist(configJson) }) }) -- cgit v1.2.3 From aad70834fc2546d5e877898098707930a7d7a4c3 Mon Sep 17 00:00:00 2001 From: herom Date: Wed, 21 Aug 2013 14:16:45 +0430 Subject: Fixes #9925: convert font data to base64, fixing 0xefbfbd (Unicode Replacement Character) chars in customizer fonts. Merges #9982 --- docs-assets/js/customizer.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs-assets/js/customizer.js') diff --git a/docs-assets/js/customizer.js b/docs-assets/js/customizer.js index cc772d222..e59418916 100644 --- a/docs-assets/js/customizer.js +++ b/docs-assets/js/customizer.js @@ -129,7 +129,7 @@ window.onload = function () { // wait for load in a dumb way because B-0 if (fonts) { var fontsFolder = zip.folder('fonts') for (var fileName in fonts) { - fontsFolder.file(fileName, fonts[fileName]) + fontsFolder.file(fileName, fonts[fileName], {base64: true}) } } -- cgit v1.2.3 From c88cd1cd95dc4bef63697124f795fe7e60308a99 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Thu, 17 Oct 2013 11:33:04 -0700 Subject: add explicit copyright header to docs CSS & JS files; fixes #11112 --- docs-assets/js/customizer.js | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'docs-assets/js/customizer.js') diff --git a/docs-assets/js/customizer.js b/docs-assets/js/customizer.js index 799707784..29479e5c6 100644 --- a/docs-assets/js/customizer.js +++ b/docs-assets/js/customizer.js @@ -1,3 +1,11 @@ +/*! + * Copyright 2013 Twitter, Inc. + * This work is licensed under the Creative Commons Attribution 3.0 Unported License. + * You should have received a copy of this license along with this work. + * If not, visit http://creativecommons.org/licenses/by/3.0/ . + */ + + window.onload = function () { // wait for load in a dumb way because B-0 var cw = '/*!\n * Bootstrap v3.0.0\n *\n * Copyright 2013 Twitter, Inc\n * Licensed under the Apache License v2.0\n * http://www.apache.org/licenses/LICENSE-2.0\n *\n * Designed and built with all the love in the world @twitter by @mdo and @fat.\n */\n\n' -- cgit v1.2.3 From 1f33dc8033b2b8245df98a79ebe8800c6c0b992e Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 17 Oct 2013 14:11:40 -0700 Subject: even shorter banner; remove space between slash and period --- docs-assets/js/customizer.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'docs-assets/js/customizer.js') diff --git a/docs-assets/js/customizer.js b/docs-assets/js/customizer.js index 29479e5c6..1b358b914 100644 --- a/docs-assets/js/customizer.js +++ b/docs-assets/js/customizer.js @@ -1,8 +1,8 @@ /*! * Copyright 2013 Twitter, Inc. - * This work is licensed under the Creative Commons Attribution 3.0 Unported License. - * You should have received a copy of this license along with this work. - * If not, visit http://creativecommons.org/licenses/by/3.0/ . + * + * Licensed under the Creative Commons Attribution 3.0 Unported License. For + * details, see http://creativecommons.org/licenses/by/3.0/. */ -- cgit v1.2.3 From 8ff7b48b7b700428c1fb55c648097c9aa364b461 Mon Sep 17 00:00:00 2001 From: Brian Surowiec Date: Fri, 1 Nov 2013 19:27:08 -0400 Subject: Update customizer.js --- docs-assets/js/customizer.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs-assets/js/customizer.js') diff --git a/docs-assets/js/customizer.js b/docs-assets/js/customizer.js index 1b358b914..99ce39aee 100644 --- a/docs-assets/js/customizer.js +++ b/docs-assets/js/customizer.js @@ -7,7 +7,7 @@ window.onload = function () { // wait for load in a dumb way because B-0 - var cw = '/*!\n * Bootstrap v3.0.0\n *\n * Copyright 2013 Twitter, Inc\n * Licensed under the Apache License v2.0\n * http://www.apache.org/licenses/LICENSE-2.0\n *\n * Designed and built with all the love in the world @twitter by @mdo and @fat.\n */\n\n' + var cw = '/*!\n * Bootstrap v3.0.1\n *\n * Copyright 2013 Twitter, Inc\n * Licensed under the Apache License v2.0\n * http://www.apache.org/licenses/LICENSE-2.0\n *\n * Designed and built with all the love in the world @twitter by @mdo and @fat.\n */\n\n' function showError(msg, err) { $('
\ -- cgit v1.2.3 From db314528eb5d6287d1d285ecb18d79cb0ffd7ebc Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Fri, 1 Nov 2013 18:56:27 -0700 Subject: don't use nonstandard window.location.origin in customizer JS; fixes #11317 --- docs-assets/js/customizer.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'docs-assets/js/customizer.js') diff --git a/docs-assets/js/customizer.js b/docs-assets/js/customizer.js index 99ce39aee..87f0bb5a1 100644 --- a/docs-assets/js/customizer.js +++ b/docs-assets/js/customizer.js @@ -56,7 +56,8 @@ window.onload = function () { // wait for load in a dumb way because B-0 data: JSON.stringify(data) }) .success(function(result) { - history.replaceState(false, document.title, window.location.origin + window.location.pathname + '?id=' + result.id) + var origin = window.location.protocol + "//" + window.location.host + history.replaceState(false, document.title, origin + window.location.pathname + '?id=' + result.id) }) .error(function(err) { showError('Ruh roh! Could not save gist file, configuration not saved.', err) -- cgit v1.2.3 From 3887f540b978d593f433bfef15888bc2d103de72 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Wed, 6 Nov 2013 13:16:40 -0800 Subject: update remaining version numbers --- docs-assets/js/customizer.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs-assets/js/customizer.js') diff --git a/docs-assets/js/customizer.js b/docs-assets/js/customizer.js index 87f0bb5a1..93555c809 100644 --- a/docs-assets/js/customizer.js +++ b/docs-assets/js/customizer.js @@ -7,7 +7,7 @@ window.onload = function () { // wait for load in a dumb way because B-0 - var cw = '/*!\n * Bootstrap v3.0.1\n *\n * Copyright 2013 Twitter, Inc\n * Licensed under the Apache License v2.0\n * http://www.apache.org/licenses/LICENSE-2.0\n *\n * Designed and built with all the love in the world @twitter by @mdo and @fat.\n */\n\n' + var cw = '/*!\n * Bootstrap v3.0.2\n *\n * Copyright 2013 Twitter, Inc\n * Licensed under the Apache License v2.0\n * http://www.apache.org/licenses/LICENSE-2.0\n *\n * Designed and built with all the love in the world @twitter by @mdo and @fat.\n */\n\n' function showError(msg, err) { $('
\ -- cgit v1.2.3 From dbbd49b4f80b87dd4c7068d4974711adf78df6da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zlatan=20Vasovi=C4=87?= Date: Sat, 23 Nov 2013 18:29:27 +0100 Subject: Fix #11594 --- docs-assets/js/customizer.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs-assets/js/customizer.js') diff --git a/docs-assets/js/customizer.js b/docs-assets/js/customizer.js index 93555c809..addab3100 100644 --- a/docs-assets/js/customizer.js +++ b/docs-assets/js/customizer.js @@ -231,7 +231,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 }) + 'bootstrap.min.css' : cw + tree.toCSS({ compress: true }).replace(/\n/g, '') } }) } catch (err) { -- cgit v1.2.3 From 8a74264344489e8b9e10c5c5e2098bb75116b8bd Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 1 Dec 2013 19:31:52 -0800 Subject: bump version numbers to 3.0.3 --- docs-assets/js/customizer.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs-assets/js/customizer.js') diff --git a/docs-assets/js/customizer.js b/docs-assets/js/customizer.js index addab3100..0534e15e0 100644 --- a/docs-assets/js/customizer.js +++ b/docs-assets/js/customizer.js @@ -7,7 +7,7 @@ window.onload = function () { // wait for load in a dumb way because B-0 - var cw = '/*!\n * Bootstrap v3.0.2\n *\n * Copyright 2013 Twitter, Inc\n * Licensed under the Apache License v2.0\n * http://www.apache.org/licenses/LICENSE-2.0\n *\n * Designed and built with all the love in the world @twitter by @mdo and @fat.\n */\n\n' + var cw = '/*!\n * Bootstrap v3.0.3\n *\n * Copyright 2013 Twitter, Inc\n * Licensed under the Apache License v2.0\n * http://www.apache.org/licenses/LICENSE-2.0\n *\n * Designed and built with all the love in the world @twitter by @mdo and @fat.\n */\n\n' function showError(msg, err) { $('
\ -- cgit v1.2.3 From 2d4ee18162e4922c7cffbf0d71a7ec7fb303d2a1 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Tue, 3 Dec 2013 13:31:47 -0800 Subject: add comment regarding #11598 --- docs-assets/js/customizer.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs-assets/js/customizer.js') diff --git a/docs-assets/js/customizer.js b/docs-assets/js/customizer.js index 0534e15e0..2c0247347 100644 --- a/docs-assets/js/customizer.js +++ b/docs-assets/js/customizer.js @@ -231,7 +231,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, '') + 'bootstrap.min.css' : cw + tree.toCSS({ compress: true }).replace(/\n/g, '') // FIXME: remove newline hack once less.js upgraded to v1.4 } }) } catch (err) { -- cgit v1.2.3 From 2fc2fe75bdfaa8c22929594d4846dfad6aab71c7 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Wed, 18 Sep 2013 21:37:55 +0300 Subject: Lint docs-assets/js/application.js and docs-assets/js/customizer.js. --- docs-assets/js/customizer.js | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) (limited to 'docs-assets/js/customizer.js') diff --git a/docs-assets/js/customizer.js b/docs-assets/js/customizer.js index 2c0247347..4d39d2170 100644 --- a/docs-assets/js/customizer.js +++ b/docs-assets/js/customizer.js @@ -5,6 +5,7 @@ * details, see http://creativecommons.org/licenses/by/3.0/. */ +/* jshint multistr:true */ window.onload = function () { // wait for load in a dumb way because B-0 var cw = '/*!\n * Bootstrap v3.0.3\n *\n * Copyright 2013 Twitter, Inc\n * Licensed under the Apache License v2.0\n * http://www.apache.org/licenses/LICENSE-2.0\n *\n * Designed and built with all the love in the world @twitter by @mdo and @fat.\n */\n\n' @@ -35,7 +36,7 @@ window.onload = function () { // wait for load in a dumb way because B-0 function getQueryParam(key) { key = key.replace(/[*+?^$.\[\]{}()|\\\/]/g, "\\$&"); // escape RegEx meta chars - var match = location.search.match(new RegExp("[?&]"+key+"=([^&]+)(&|$)")); + var match = location.search.match(new RegExp("[?&]" + key + "=([^&]+)(&|$)")); return match && decodeURIComponent(match[1].replace(/\+/g, " ")); } @@ -55,11 +56,11 @@ window.onload = function () { // wait for load in a dumb way because B-0 dataType: 'json', data: JSON.stringify(data) }) - .success(function(result) { + .success(function (result) { var origin = window.location.protocol + "//" + window.location.host history.replaceState(false, document.title, origin + window.location.pathname + '?id=' + result.id) }) - .error(function(err) { + .error(function (err) { showError('Ruh roh! Could not save gist file, configuration not saved.', err) }) } @@ -69,7 +70,7 @@ window.onload = function () { // wait for load in a dumb way because B-0 $('#less-variables-section input') .each(function () { - $(this).val() && (vars[ $(this).prev().text() ] = $(this).val()) + $(this).val() && (vars[$(this).prev().text()] = $(this).val()) }) var data = { @@ -93,7 +94,7 @@ window.onload = function () { // wait for load in a dumb way because B-0 type: 'GET', dataType: 'json' }) - .success(function(result) { + .success(function (result) { var data = JSON.parse(result.files['config.json'].content) if (data.js) { $('#plugin-section input').each(function () { @@ -111,7 +112,7 @@ window.onload = function () { // wait for load in a dumb way because B-0 } } }) - .error(function(err) { + .error(function (err) { showError('Error fetching bootstrap config file', err) }) } @@ -130,23 +131,23 @@ window.onload = function () { // wait for load in a dumb way because B-0 if (js) { var jsFolder = zip.folder('js') - for (var fileName in js) { - jsFolder.file(fileName, js[fileName]) + for (var jsFileName in js) { + jsFolder.file(jsFileName, js[jsFileName]) } } if (fonts) { var fontsFolder = zip.folder('fonts') - for (var fileName in fonts) { - fontsFolder.file(fileName, fonts[fileName], {base64: true}) + for (var fontsFileName in fonts) { + fontsFolder.file(fontsFileName, fonts[fontsFileName], {base64: true}) } } if (config) { - zip.file('config.json', config) + zip.file("config.json", config) } - var content = zip.generate({type:"blob"}) + var content = zip.generate({ type: "blob" }) complete(content) } @@ -201,7 +202,7 @@ window.onload = function () { // wait for load in a dumb way because B-0 $('#less-variables-section input') .each(function () { - $(this).val() && (vars[ $(this).prev().text() ] = $(this).val()) + $(this).val() && (vars[$(this).prev().text()] = $(this).val()) }) $.each(bootstrapLessFilenames(), function(index, filename) { @@ -325,7 +326,7 @@ window.onload = function () { // wait for load in a dumb way because B-0 $('.bs-docs-section, .bs-sidebar').css('display', 'none') showCallout("Looks like your current browser doesn't support the Bootstrap Customizer. Please take a second\ - to upgrade to a more modern browser.", true) + to upgrade to a more modern browser.", true) } parseUrl() -- cgit v1.2.3 From eca8ff380388c1187bc2c86e0ae7fa80aa33111e Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Wed, 18 Sep 2013 19:50:02 +0300 Subject: Use single quotes consistently. --- docs-assets/js/customizer.js | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) (limited to 'docs-assets/js/customizer.js') diff --git a/docs-assets/js/customizer.js b/docs-assets/js/customizer.js index 4d39d2170..d560769c3 100644 --- a/docs-assets/js/customizer.js +++ b/docs-assets/js/customizer.js @@ -35,18 +35,18 @@ window.onload = function () { // wait for load in a dumb way because B-0 } function getQueryParam(key) { - key = key.replace(/[*+?^$.\[\]{}()|\\\/]/g, "\\$&"); // escape RegEx meta chars - var match = location.search.match(new RegExp("[?&]" + key + "=([^&]+)(&|$)")); - return match && decodeURIComponent(match[1].replace(/\+/g, " ")); + key = key.replace(/[*+?^$.\[\]{}()|\\\/]/g, '\\$&'); // escape RegEx meta chars + var match = location.search.match(new RegExp('[?&]' + key + '=([^&]+)(&|$)')); + return match && decodeURIComponent(match[1].replace(/\+/g, ' ')); } function createGist(configJson) { var data = { - "description": "Bootstrap Customizer Config", - "public": true, - "files": { - "config.json": { - "content": configJson + 'description': 'Bootstrap Customizer Config', + 'public': true, + 'files': { + 'config.json': { + 'content': configJson } } } @@ -57,7 +57,7 @@ window.onload = function () { // wait for load in a dumb way because B-0 data: JSON.stringify(data) }) .success(function (result) { - var origin = window.location.protocol + "//" + window.location.host + var origin = window.location.protocol + '//' + window.location.host history.replaceState(false, document.title, origin + window.location.pathname + '?id=' + result.id) }) .error(function (err) { @@ -144,10 +144,10 @@ window.onload = function () { // wait for load in a dumb way because B-0 } if (config) { - zip.file("config.json", config) + zip.file('config.json', config) } - var content = zip.generate({ type: "blob" }) + var content = zip.generate({ type: 'blob' }) complete(content) } @@ -311,22 +311,22 @@ window.onload = function () { // wait for load in a dumb way because B-0 generateZip(generateCSS(), generateJavascript(), generateFonts(), configJson, function (blob) { $compileBtn.removeAttr('disabled') - saveAs(blob, "bootstrap.zip") + saveAs(blob, 'bootstrap.zip') createGist(configJson) }) }) // browser support alerts if (!window.URL && navigator.userAgent.toLowerCase().indexOf('safari') != -1) { - showCallout("Looks like you're using safari, which sadly doesn't have the best support\ - for HTML5 blobs. Because of this your file will be downloaded with the name \"untitled\".\ - However, if you check your downloads folder, just rename this \"untitled\" file\ - to \"bootstrap.zip\" and you should be good to go!") + showCallout('Looks like you\'re using safari, which sadly doesn\'t have the best support\ + for HTML5 blobs. Because of this your file will be downloaded with the name "untitled".\ + However, if you check your downloads folder, just rename this "untitled" file\ + to "bootstrap.zip" and you should be good to go!') } else if (!window.URL && !window.webkitURL) { $('.bs-docs-section, .bs-sidebar').css('display', 'none') - showCallout("Looks like your current browser doesn't support the Bootstrap Customizer. Please take a second\ - to upgrade to a more modern browser.", true) + showCallout('Looks like your current browser doesn\'t support the Bootstrap Customizer. Please take a second\ + to upgrade to a more modern browser.', true) } parseUrl() -- cgit v1.2.3 From e1247e3edc35ff8419af3ab984bda69529aa4da1 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 8 Dec 2013 17:17:51 -0800 Subject: Match customizer banner to Gruntfile banner --- docs-assets/js/customizer.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs-assets/js/customizer.js') diff --git a/docs-assets/js/customizer.js b/docs-assets/js/customizer.js index d560769c3..cfc7010b0 100644 --- a/docs-assets/js/customizer.js +++ b/docs-assets/js/customizer.js @@ -8,7 +8,7 @@ /* jshint multistr:true */ window.onload = function () { // wait for load in a dumb way because B-0 - var cw = '/*!\n * Bootstrap v3.0.3\n *\n * Copyright 2013 Twitter, Inc\n * Licensed under the Apache License v2.0\n * http://www.apache.org/licenses/LICENSE-2.0\n *\n * Designed and built with all the love in the world @twitter by @mdo and @fat.\n */\n\n' + var cw = '/*!\n * Bootstrap v3.0.3 (http://getbootstrap.com)\n\n *\n * Copyright 2013 Twitter, Inc\n * Licensed under the Apache License v2.0\n * http://www.apache.org/licenses/LICENSE-2.0\n */\n\n' function showError(msg, err) { $('
\ -- cgit v1.2.3 From caa3d53dcbb99234ffb901b393196eef5b5f5452 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Wed, 11 Dec 2013 00:29:42 +0200 Subject: customizer.js: remove a workaround for older less.js. --- docs-assets/js/customizer.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs-assets/js/customizer.js') 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) { -- cgit v1.2.3