aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Rebert <[email protected]>2015-09-02 13:09:14 -0700
committerChris Rebert <[email protected]>2015-09-02 13:09:14 -0700
commitd13c4b35d458e359208da6abbe89b8932fc87dd0 (patch)
treeae663813815e4f7fe91ba6970a9be984a0d2dc68
parente0a2b9ed4c8707682f8e6c1ebbebcb51f4fc46ac (diff)
parent750656fc9cb00b3ac399ed958955d0df6d901ffe (diff)
downloadbootstrap-d13c4b35d458e359208da6abbe89b8932fc87dd0.tar.xz
bootstrap-d13c4b35d458e359208da6abbe89b8932fc87dd0.zip
Merge pull request #17447 from Stavrus/sass-license-header
Add a license header to bootstrap.scss
-rw-r--r--Gruntfile.js12
-rw-r--r--package.json1
-rw-r--r--scss/bootstrap.scss8
3 files changed, 8 insertions, 13 deletions
diff --git a/Gruntfile.js b/Gruntfile.js
index 80437041f..0af3eacf0 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -278,16 +278,6 @@ module.exports = function (grunt) {
}
},
- usebanner: {
- options: {
- position: 'top',
- banner: '<%= banner %>'
- },
- files: {
- src: 'dist/css/*.css'
- }
- },
-
csscomb: {
options: {
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: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.
grunt.registerTask('dist', ['clean:dist', 'dist-css', 'dist-js']);
diff --git a/package.json b/package.json
index 3f0e37f09..4451ccfd5 100644
--- a/package.json
+++ b/package.json
@@ -34,7 +34,6 @@
"grunt": "~0.4.5",
"grunt-autoprefixer": "~2.2.0",
"grunt-babel": "^5.0.0",
- "grunt-banner": "~0.3.1",
"grunt-build-control": "~0.2.0",
"grunt-contrib-clean": "~0.6.0",
"grunt-contrib-compress": "~0.13.0",
diff --git a/scss/bootstrap.scss b/scss/bootstrap.scss
index 892ae560a..203109faf 100644
--- a/scss/bootstrap.scss
+++ b/scss/bootstrap.scss
@@ -1,4 +1,10 @@
-// Core variables and mixins
+/*!
+ * 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
@import "variables";
@import "mixins";