diff options
| author | Mark Otto <[email protected]> | 2013-12-22 22:31:28 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-12-22 22:31:28 -0800 |
| commit | 6fda30e1c4532f639ae3cfe3921ea6cfb143e11b (patch) | |
| tree | 7993782818caaaae63cf15da5ea402083fb6b029 /docs-assets | |
| parent | 9fc0e20381ec06bc85c68a5e6f1f2a5103a3267a (diff) | |
| parent | 45a8a9508ed8c2cced5e8ce0b21ef3fd11fe6e15 (diff) | |
| download | bootstrap-6fda30e1c4532f639ae3cfe3921ea6cfb143e11b.tar.xz bootstrap-6fda30e1c4532f639ae3cfe3921ea6cfb143e11b.zip | |
Merge branch 'master' of github.com:twbs/bootstrap
Diffstat (limited to 'docs-assets')
| -rw-r--r-- | docs-assets/js/application.js | 4 | ||||
| -rw-r--r-- | docs-assets/js/customizer.js | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/docs-assets/js/application.js b/docs-assets/js/application.js index 3fd599eb7..78eed1ae9 100644 --- a/docs-assets/js/application.js +++ b/docs-assets/js/application.js @@ -59,8 +59,8 @@ var navOuterHeight = $('.bs-docs-nav').height() return (this.top = offsetTop - navOuterHeight - sideBarMargin) - } - , bottom: function () { + }, + bottom: function () { return (this.bottom = $('.bs-footer').outerHeight(true)) } } diff --git a/docs-assets/js/customizer.js b/docs-assets/js/customizer.js index cd0f93319..0e32f8090 100644 --- a/docs-assets/js/customizer.js +++ b/docs-assets/js/customizer.js @@ -227,9 +227,9 @@ window.onload = function () { // wait for load in a dumb way because B-0 try { var parser = new less.Parser({ - paths: ['variables.less', 'mixins.less'] - , optimization: 0 - , filename: 'bootstrap.css' + paths: ['variables.less', 'mixins.less'], + optimization: 0, + filename: 'bootstrap.css' }).parse(css, function (err, tree) { if (err) { return showError('<strong>Ruh roh!</strong> Could not parse less files.', err) |