Skip to content

Commit

Permalink
Merge pull request #13167 from ZDroid/underscore
Browse files Browse the repository at this point in the history
Fix #13138: use underscore prefix to ignore directories
  • Loading branch information
cvrebert committed Mar 25, 2014
2 parents 0dfd737 + 8ae4818 commit eb102c2
Show file tree
Hide file tree
Showing 14 changed files with 16 additions and 21 deletions.
32 changes: 16 additions & 16 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ module.exports = function (grunt) {
src: 'js/tests/unit/*.js'
},
assets: {
src: 'docs/assets/js/src/*.js'
src: 'docs/assets/js/_src/*.js'
}
},

Expand Down Expand Up @@ -122,13 +122,13 @@ module.exports = function (grunt) {
preserveComments: 'some'
},
src: [
'docs/assets/js/vendor/less.min.js',
'docs/assets/js/vendor/jszip.min.js',
'docs/assets/js/vendor/uglify.min.js',
'docs/assets/js/vendor/blob.js',
'docs/assets/js/vendor/filesaver.js',
'docs/assets/js/_vendor/less.min.js',
'docs/assets/js/_vendor/jszip.min.js',
'docs/assets/js/_vendor/uglify.min.js',
'docs/assets/js/_vendor/blob.js',
'docs/assets/js/_vendor/filesaver.js',
'docs/assets/js/raw-files.min.js',
'docs/assets/js/src/customizer.js'
'docs/assets/js/_src/customizer.js'
],
dest: 'docs/assets/js/customize.min.js'
},
Expand All @@ -137,8 +137,8 @@ module.exports = function (grunt) {
preserveComments: 'some'
},
src: [
'docs/assets/js/vendor/holder.js',
'docs/assets/js/src/application.js'
'docs/assets/js/_vendor/holder.js',
'docs/assets/js/_src/application.js'
],
dest: 'docs/assets/js/docs.min.js'
}
Expand Down Expand Up @@ -206,7 +206,7 @@ module.exports = function (grunt) {
src: 'dist/css/<%= pkg.name %>-theme.css'
},
docs: {
src: 'docs/assets/css/src/docs.css'
src: 'docs/assets/css/_src/docs.css'
},
examples: {
expand: true,
Expand Down Expand Up @@ -240,7 +240,7 @@ module.exports = function (grunt) {
ids: false,
'overqualified-elements': false
},
src: 'docs/assets/css/src/docs.css'
src: 'docs/assets/css/_src/docs.css'
}
},

Expand All @@ -253,8 +253,8 @@ module.exports = function (grunt) {
},
docs: {
src: [
'docs/assets/css/src/docs.css',
'docs/assets/css/src/pygments-manni.css'
'docs/assets/css/_src/docs.css',
'docs/assets/css/_src/pygments-manni.css'
],
dest: 'docs/assets/css/docs.min.css'
}
Expand Down Expand Up @@ -288,7 +288,7 @@ module.exports = function (grunt) {
},
docs: {
files: {
'docs/assets/css/src/docs.css': 'docs/assets/css/src/docs.css'
'docs/assets/css/_src/docs.css': 'docs/assets/css/_src/docs.css'
}
}
},
Expand Down Expand Up @@ -336,8 +336,8 @@ module.exports = function (grunt) {
}
},
files: {
'docs/_includes/customizer-variables.html': 'docs/jade/customizer-variables.jade',
'docs/_includes/nav/customize.html': 'docs/jade/customizer-nav.jade'
'docs/_includes/customizer-variables.html': 'docs/_jade/customizer-variables.jade',
'docs/_includes/nav/customize.html': 'docs/_jade/customizer-nav.jade'
}
}
},
Expand Down
5 changes: 0 additions & 5 deletions _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,6 @@ baseurl: /
url: http://getbootstrap.com
encoding: UTF-8

exclude:
- jade
- src
- vendor

# Custom vars
current_version: 3.1.1
repo: https://github.com/twbs/bootstrap
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit eb102c2

Please sign in to comment.