Skip to content

Commit 27df020

Browse files
committed
convert to scss
1 parent 6bd8421 commit 27df020

File tree

102 files changed

+8354
-6742
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

102 files changed

+8354
-6742
lines changed

Gruntfile.js

Lines changed: 57 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ module.exports = function (grunt) {
2020
var npmShrinkwrap = require('npm-shrinkwrap');
2121
var BsLessdocParser = require('./grunt/bs-lessdoc-parser.js');
2222
var getLessVarsData = function () {
23-
var filePath = path.join(__dirname, 'less/_variables.less');
23+
var filePath = path.join(__dirname, 'scss/_variables.scss');
2424
var fileContent = fs.readFileSync(filePath, { encoding: 'utf8' });
2525
var parser = new BsLessdocParser(fileContent);
2626
return { sections: parser.parseFile() };
2727
};
28-
var generateRawFiles = require('./grunt/bs-raw-files-generator.js');
28+
// var generateRawFiles = require('./grunt/bs-raw-files-generator.js');
2929
var generateCommonJSModule = require('./grunt/bs-commonjs-generator.js');
3030
var configBridge = grunt.file.readJSON('./grunt/configBridge.json', { encoding: 'utf8' });
3131

@@ -148,25 +148,56 @@ module.exports = function (grunt) {
148148
files: 'js/tests/index.html'
149149
},
150150

151-
less: {
151+
// less: {
152+
// core: {
153+
// options: {
154+
// strictMath: true,
155+
// sourceMap: true,
156+
// outputSourceFiles: true,
157+
// sourceMapURL: '<%= pkg.name %>.css.map',
158+
// sourceMapFilename: 'dist/css/<%= pkg.name %>.css.map'
159+
// },
160+
// src: 'less/bootstrap.less',
161+
// dest: 'dist/css/<%= pkg.name %>.css'
162+
// },
163+
// docs: {
164+
// options: {
165+
// strictMath: true
166+
// },
167+
// files: {
168+
// 'docs/assets/css/docs.min.css': 'docs/assets/less/docs.less'
169+
// }
170+
// }
171+
// },
172+
173+
sass: {
174+
options: {
175+
includePaths: ['scss'],
176+
precision: 6,
177+
sourceMap: true
178+
},
152179
core: {
153-
options: {
154-
strictMath: true,
155-
sourceMap: true,
156-
outputSourceFiles: true,
157-
sourceMapURL: '<%= pkg.name %>.css.map',
158-
sourceMapFilename: 'dist/css/<%= pkg.name %>.css.map'
159-
},
160-
src: 'less/bootstrap.less',
161-
dest: 'dist/css/<%= pkg.name %>.css'
180+
// files: [{
181+
// expand: true,
182+
// cwd: './scss',
183+
// src: ['<%= pkg.name %>.scss'],
184+
// dest: './dist/css',
185+
// ext: '.css'
186+
// }]
187+
files: {
188+
'dist/css/<%= pkg.name %>.css': 'scss/<%= pkg.name %>.scss'
189+
}
162190
},
163191
docs: {
164-
options: {
165-
strictMath: true
166-
},
167192
files: {
168-
'docs/assets/css/docs.min.css': 'docs/assets/less/docs.less'
193+
'docs/assets/css/docs.min.css': 'docs/assets/scss/docs.scss'
169194
}
195+
// },
196+
// watch: {
197+
// css: {
198+
// files: './scss/**/*.scss',
199+
// tasks: ['sass']
200+
// }
170201
}
171202
},
172203

@@ -220,7 +251,7 @@ module.exports = function (grunt) {
220251

221252
csscomb: {
222253
options: {
223-
config: 'less/.csscomb.json'
254+
config: 'scss/.csscomb.json'
224255
},
225256
dist: {
226257
expand: true,
@@ -396,8 +427,8 @@ module.exports = function (grunt) {
396427
grunt.registerTask('dist-js', ['concat', 'uglify:core', 'commonjs']);
397428

398429
// CSS distribution task.
399-
grunt.registerTask('less-compile', ['less:core', 'less:docs']);
400-
grunt.registerTask('dist-css', ['less-compile', 'autoprefixer:core', 'usebanner', 'csscomb:dist', 'cssmin:core', 'cssmin:docs']);
430+
grunt.registerTask('sass-compile', ['sass:core', 'sass:docs']);
431+
grunt.registerTask('dist-css', ['sass-compile', 'autoprefixer:core', 'usebanner', 'csscomb:dist', 'cssmin:core', 'cssmin:docs']);
401432

402433
// Full distribution task.
403434
grunt.registerTask('dist', ['clean:dist', 'dist-css', 'dist-js']);
@@ -411,12 +442,12 @@ module.exports = function (grunt) {
411442
grunt.registerTask('change-version-number', 'sed');
412443

413444
// task for building customizer
414-
grunt.registerTask('build-customizer', ['build-customizer-html', 'build-raw-files']);
415-
grunt.registerTask('build-customizer-html', 'jade');
416-
grunt.registerTask('build-raw-files', 'Add scripts/less files to customizer.', function () {
417-
var banner = grunt.template.process('<%= banner %>');
418-
generateRawFiles(grunt, banner);
419-
});
445+
// grunt.registerTask('build-customizer', ['build-customizer-html', 'build-raw-files']);
446+
// grunt.registerTask('build-customizer-html', 'jade');
447+
// grunt.registerTask('build-raw-files', 'Add scripts/less files to customizer.', function () {
448+
// var banner = grunt.template.process('<%= banner %>');
449+
// generateRawFiles(grunt, banner);
450+
// });
420451

421452
grunt.registerTask('commonjs', 'Generate CommonJS entrypoint module in dist dir.', function () {
422453
var srcFiles = grunt.config.get('concat.bootstrap.src');
@@ -428,7 +459,7 @@ module.exports = function (grunt) {
428459
grunt.registerTask('docs-css', ['autoprefixer:docs', 'autoprefixer:examples', 'csscomb:docs', 'csscomb:examples', 'cssmin:docs']);
429460
grunt.registerTask('docs-js', ['uglify:docsJs', 'uglify:customize']);
430461
grunt.registerTask('lint-docs-js', ['jshint:assets', 'jscs:assets']);
431-
grunt.registerTask('docs', ['docs-css', 'docs-js', 'lint-docs-js', 'clean:docs', 'copy:docs', 'build-customizer']);
462+
grunt.registerTask('docs', ['docs-css', 'docs-js', 'lint-docs-js', 'clean:docs', 'copy:docs']);
432463

433464
grunt.registerTask('docs-github', ['jekyll:github']);
434465

0 commit comments

Comments
 (0)