mirror of
https://github.com/twbs/bootstrap.git
synced 2025-03-15 15:29:22 +01:00
Merge branch 'master' into docs_derp
Conflicts: docs/_includes/old-bs-docs.html
This commit is contained in:
commit
cae63200d8
@ -133,7 +133,7 @@ module.exports = function (grunt) {
|
||||
src: [
|
||||
'docs/assets/js/less.min.js',
|
||||
'docs/assets/js/jszip.js',
|
||||
'docs/assets/js/uglify.js',
|
||||
'docs/assets/js/uglify.min.js',
|
||||
'docs/assets/js/blob.js',
|
||||
'docs/assets/js/filesaver.js',
|
||||
'docs/assets/js/raw-files.js',
|
||||
@ -396,5 +396,8 @@ module.exports = function (grunt) {
|
||||
// task for building customizer
|
||||
grunt.registerTask('build-customizer', ['build-customizer-vars-form', 'build-raw-files']);
|
||||
grunt.registerTask('build-customizer-vars-form', ['jade']);
|
||||
grunt.registerTask('build-raw-files', 'Add scripts/less files to customizer.', generateRawFilesJs);
|
||||
grunt.registerTask('build-raw-files', 'Add scripts/less files to customizer.', function () {
|
||||
var banner = grunt.template.process('<%= banner %>');
|
||||
generateRawFilesJs(banner);
|
||||
});
|
||||
};
|
||||
|
File diff suppressed because one or more lines are too long
@ -41,7 +41,7 @@ function Section(heading, customizable) {
|
||||
|
||||
Section.prototype.addSubSection = function (subsection) {
|
||||
this.subsections.push(subsection);
|
||||
}
|
||||
};
|
||||
|
||||
function SubSection(heading) {
|
||||
this.heading = heading.trim();
|
||||
|
@ -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)
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user