rev/bootstrap
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into docs_derp

Browse source 
Conflicts:
	docs/_includes/old-bs-docs.html
This commit is contained in:
Mark Otto 2014-01-14 15:53:06 -08:00
commit cae63200d8
5 changed files with 16 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
docs/assets/js/raw-files.js
View file

File diff suppressed because one or more lines are too long

0
docs/assets/js/uglify.js → docs/assets/js/uglify.min.js vendored
View file

2
docs/grunt/bs-lessdoc-parser.js
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();

7
docs/grunt/bs-raw-files-generator.js
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)
}