diff options
| author | Mark Otto <[email protected]> | 2014-01-14 15:53:06 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-01-14 15:53:06 -0800 |
| commit | cae63200d8a645f385349debd940666ddbca0b38 (patch) | |
| tree | 280892d40cdbbc10b8e3937028a9bc933a4b266c /docs/grunt | |
| parent | edd0b97be521346da0cdd39573914d9b9902167b (diff) | |
| parent | 8fb75ee9e78ecb0954e1634ab85e91d533d0ab42 (diff) | |
| download | bootstrap-cae63200d8a645f385349debd940666ddbca0b38.tar.xz bootstrap-cae63200d8a645f385349debd940666ddbca0b38.zip | |
Merge branch 'master' into docs_derp
Conflicts:
docs/_includes/old-bs-docs.html
Diffstat (limited to 'docs/grunt')
| -rw-r--r-- | docs/grunt/bs-lessdoc-parser.js | 2 | ||||
| -rw-r--r-- | docs/grunt/bs-raw-files-generator.js | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/docs/grunt/bs-lessdoc-parser.js b/docs/grunt/bs-lessdoc-parser.js index 246304819..50c6ebbd3 100644 --- a/docs/grunt/bs-lessdoc-parser.js +++ b/docs/grunt/bs-lessdoc-parser.js @@ -41,7 +41,7 @@ function Section(heading, customizable) { Section.prototype.addSubSection = function (subsection) { this.subsections.push(subsection); -} +}; function SubSection(heading) { this.heading = heading.trim(); diff --git a/docs/grunt/bs-raw-files-generator.js b/docs/grunt/bs-raw-files-generator.js index 6b23cca7c..e4ba8d48c 100644 --- a/docs/grunt/bs-raw-files-generator.js +++ b/docs/grunt/bs-raw-files-generator.js @@ -16,7 +16,10 @@ function getFiles(type) { return 'var __' + type + ' = ' + JSON.stringify(files) + '\n' } -module.exports = function generateRawFilesJs() { - var files = getFiles('js') + getFiles('less') + getFiles('fonts') +module.exports = function generateRawFilesJs(banner) { + if (!banner) { + banner = '' + } + var files = banner + getFiles('js') + getFiles('less') + getFiles('fonts') fs.writeFileSync('docs/assets/js/raw-files.js', files) } |
