mirror of
https://github.com/twbs/bootstrap.git
synced 2025-02-11 08:54:23 +01:00
Merge pull request #17447 from Stavrus/sass-license-header
Add a license header to bootstrap.scss
This commit is contained in:
commit
d13c4b35d4
12
Gruntfile.js
12
Gruntfile.js
@ -278,16 +278,6 @@ module.exports = function (grunt) {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
usebanner: {
|
|
||||||
options: {
|
|
||||||
position: 'top',
|
|
||||||
banner: '<%= banner %>'
|
|
||||||
},
|
|
||||||
files: {
|
|
||||||
src: 'dist/css/*.css'
|
|
||||||
}
|
|
||||||
},
|
|
||||||
|
|
||||||
csscomb: {
|
csscomb: {
|
||||||
options: {
|
options: {
|
||||||
config: 'scss/.csscomb.json'
|
config: 'scss/.csscomb.json'
|
||||||
@ -475,7 +465,7 @@ module.exports = function (grunt) {
|
|||||||
// grunt.registerTask('sass-compile', ['sass:core', 'sass:extras', 'sass:docs']);
|
// grunt.registerTask('sass-compile', ['sass:core', 'sass:extras', 'sass:docs']);
|
||||||
grunt.registerTask('sass-compile', ['sass:core', 'sass:docs']);
|
grunt.registerTask('sass-compile', ['sass:core', 'sass:docs']);
|
||||||
|
|
||||||
grunt.registerTask('dist-css', ['sass-compile', 'postcss:core', 'autoprefixer:core', 'usebanner', 'csscomb:dist', 'cssmin:core', 'cssmin:docs']);
|
grunt.registerTask('dist-css', ['sass-compile', 'postcss:core', 'autoprefixer:core', 'csscomb:dist', 'cssmin:core', 'cssmin:docs']);
|
||||||
|
|
||||||
// Full distribution task.
|
// Full distribution task.
|
||||||
grunt.registerTask('dist', ['clean:dist', 'dist-css', 'dist-js']);
|
grunt.registerTask('dist', ['clean:dist', 'dist-css', 'dist-js']);
|
||||||
|
@ -34,7 +34,6 @@
|
|||||||
"grunt": "~0.4.5",
|
"grunt": "~0.4.5",
|
||||||
"grunt-autoprefixer": "~2.2.0",
|
"grunt-autoprefixer": "~2.2.0",
|
||||||
"grunt-babel": "^5.0.0",
|
"grunt-babel": "^5.0.0",
|
||||||
"grunt-banner": "~0.3.1",
|
|
||||||
"grunt-build-control": "~0.2.0",
|
"grunt-build-control": "~0.2.0",
|
||||||
"grunt-contrib-clean": "~0.6.0",
|
"grunt-contrib-clean": "~0.6.0",
|
||||||
"grunt-contrib-compress": "~0.13.0",
|
"grunt-contrib-compress": "~0.13.0",
|
||||||
|
6
scss/bootstrap.scss
vendored
6
scss/bootstrap.scss
vendored
@ -1,3 +1,9 @@
|
|||||||
|
/*!
|
||||||
|
* Bootstrap v4.0.0-alpha (http://getbootstrap.com)
|
||||||
|
* Copyright 2011-2015 Twitter, Inc.
|
||||||
|
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
|
||||||
|
*/
|
||||||
|
|
||||||
// Core variables and mixins
|
// Core variables and mixins
|
||||||
@import "variables";
|
@import "variables";
|
||||||
@import "mixins";
|
@import "mixins";
|
||||||
|
Loading…
x
Reference in New Issue
Block a user