2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-05-24 14:04:09 +03:00

Merge branch 'master' into docs_derp

Conflicts:
	docs/_includes/old-bs-docs.html
This commit is contained in:
Mark Otto
2014-01-14 15:53:06 -08:00
5 changed files with 16 additions and 5 deletions
File diff suppressed because one or more lines are too long
+1 -1
View File
@@ -41,7 +41,7 @@ function Section(heading, customizable) {
Section.prototype.addSubSection = function (subsection) {
this.subsections.push(subsection);
}
};
function SubSection(heading) {
this.heading = heading.trim();
+5 -2
View File
@@ -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)
}