From 40142bdc5197b69f26e4d8ea3e30cd4fcf0d7cdb Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Wed, 12 Feb 2014 11:02:37 -0800 Subject: fix #12708 by updating class names in the docs 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 077fd3218..da584b6ac 100644 --- a/docs/assets/js/customizer.js +++ b/docs/assets/js/customizer.js @@ -338,7 +338,7 @@ window.onload = function () { // wait for load in a dumb way because B-0 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') + $('.bs-docs-section, .bs-docs-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) -- cgit v1.2.3 From fe2222e73355af18ad2b1869efb5fb0ab64f42f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zlatan=20Vasovi=C4=87?= Date: Wed, 12 Feb 2014 20:54:43 +0100 Subject: Fix multistr errors in customizer.js --- docs/assets/js/customizer.js | 36 +++++++++++++++++------------------- 1 file changed, 17 insertions(+), 19 deletions(-) (limited to 'docs/assets/js/customizer.js') diff --git a/docs/assets/js/customizer.js b/docs/assets/js/customizer.js index da584b6ac..ee85cc85e 100644 --- a/docs/assets/js/customizer.js +++ b/docs/assets/js/customizer.js @@ -6,8 +6,6 @@ * 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.1.0 (http://getbootstrap.com)\n' + @@ -16,21 +14,21 @@ window.onload = function () { // wait for load in a dumb way because B-0 ' */\n\n' function showError(msg, err) { - $('
\ -
\ - ×\ -

' + msg + '

' + - (err.extract ? '
' + err.extract.join('\n') + '
' : '') + '\ -
\ -
').appendTo('body').alert() + $('
' + + '
' + + '×' + + '

' + msg + '

' + + (err.extract ? '
' + err.extract.join('\n') + '
' : '') + + '
' + + '
').appendTo('body').alert() throw err } function showCallout(msg, showUpTop) { - var callout = $('
\ -

Attention!

\ -

' + msg + '

\ -
') + var callout = $('
' + + '

Attention!

' + + '

' + msg + '

' + + '
') if (showUpTop) { callout.appendTo('.bs-docs-container') @@ -333,15 +331,15 @@ window.onload = function () { // wait for load in a dumb way because B-0 // 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-docs-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 88fdd4542749275d6ab970ee040f2efe10018d5b Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 13 Feb 2014 01:12:26 -0800 Subject: v3.1.1 bump --- 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 ee85cc85e..d4620f7d6 100644 --- a/docs/assets/js/customizer.js +++ b/docs/assets/js/customizer.js @@ -8,7 +8,7 @@ window.onload = function () { // wait for load in a dumb way because B-0 var cw = '/*!\n' + - ' * Bootstrap v3.1.0 (http://getbootstrap.com)\n' + + ' * Bootstrap v3.1.1 (http://getbootstrap.com)\n' + ' * Copyright 2011-2014 Twitter, Inc.\n' + ' * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)\n' + ' */\n\n' -- cgit v1.2.3 From 65ffe69bdf1a36103241901cbec72b67632d60ce Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Thu, 13 Feb 2014 10:05:04 +0200 Subject: Fix customizer.js indentation warnings. --- 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 d4620f7d6..c7385534c 100644 --- a/docs/assets/js/customizer.js +++ b/docs/assets/js/customizer.js @@ -209,9 +209,9 @@ window.onload = function () { // wait for load in a dumb way because B-0 function compileLESS(lessSource, baseFilename, intoResult) { var parser = new less.Parser({ - paths: ['variables.less', 'mixins.less'], - optimization: 0, - filename: baseFilename + '.css' + paths: ['variables.less', 'mixins.less'], + optimization: 0, + filename: baseFilename + '.css' }).parse(lessSource, function (err, tree) { if (err) { return showError('Ruh roh! Could not parse less files.', err) -- cgit v1.2.3 From 537e10033e055bc060ecbd57a678e6cfcfffed30 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Wed, 19 Feb 2014 09:11:05 +0200 Subject: Switch to using JSCS for the indentation check. --- docs/assets/js/customizer.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'docs/assets/js/customizer.js') diff --git a/docs/assets/js/customizer.js b/docs/assets/js/customizer.js index c7385534c..a0e4a28d1 100644 --- a/docs/assets/js/customizer.js +++ b/docs/assets/js/customizer.js @@ -72,9 +72,9 @@ window.onload = function () { // wait for load in a dumb way because B-0 var vars = {} $('#less-variables-section input') - .each(function () { - $(this).val() && (vars[$(this).prev().text()] = $(this).val()) - }) + .each(function () { + $(this).val() && (vars[$(this).prev().text()] = $(this).val()) + }) var data = { vars: vars, @@ -238,9 +238,9 @@ window.onload = function () { // wait for load in a dumb way because B-0 var vars = {} $('#less-variables-section input') - .each(function () { - $(this).val() && (vars[$(this).prev().text()] = $(this).val()) - }) + .each(function () { + $(this).val() && (vars[$(this).prev().text()] = $(this).val()) + }) var bsLessSource = generateLESS('bootstrap.less', lessFileIncludes, vars) var themeLessSource = generateLESS('theme.less', lessFileIncludes, vars) -- cgit v1.2.3