Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/twbs/bootstrap.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZlatan Vasović <legospace9876@gmail.com>2014-03-25 00:47:59 +0400
committerZlatan Vasović <legospace9876@gmail.com>2014-03-25 00:47:59 +0400
commit8ae48183b236d4db104fa165b8aea762d70b9d67 (patch)
tree9ecbc0c61f38f3274c31423b0d74cbf418b6448c
parentd74aee409342d086ae6b087ea6dc3e71f6da055c (diff)
Fix #13138: use underscore prefix to ignore directories
-rw-r--r--Gruntfile.js32
-rw-r--r--_config.yml5
-rw-r--r--docs/_jade/customizer-nav.jade (renamed from docs/jade/customizer-nav.jade)0
-rw-r--r--docs/_jade/customizer-variables.jade (renamed from docs/jade/customizer-variables.jade)0
-rw-r--r--docs/assets/css/_src/docs.css (renamed from docs/assets/css/src/docs.css)0
-rw-r--r--docs/assets/css/_src/pygments-manni.css (renamed from docs/assets/css/src/pygments-manni.css)0
-rw-r--r--docs/assets/js/_src/application.js (renamed from docs/assets/js/src/application.js)0
-rw-r--r--docs/assets/js/_src/customizer.js (renamed from docs/assets/js/src/customizer.js)0
-rw-r--r--docs/assets/js/_vendor/blob.js (renamed from docs/assets/js/vendor/blob.js)0
-rw-r--r--docs/assets/js/_vendor/filesaver.js (renamed from docs/assets/js/vendor/filesaver.js)0
-rw-r--r--docs/assets/js/_vendor/holder.js (renamed from docs/assets/js/vendor/holder.js)0
-rw-r--r--docs/assets/js/_vendor/jszip.min.js (renamed from docs/assets/js/vendor/jszip.min.js)0
-rw-r--r--docs/assets/js/_vendor/less.min.js (renamed from docs/assets/js/vendor/less.min.js)0
-rw-r--r--docs/assets/js/_vendor/uglify.min.js (renamed from docs/assets/js/vendor/uglify.min.js)0
14 files changed, 16 insertions, 21 deletions
diff --git a/Gruntfile.js b/Gruntfile.js
index b4438e89d3..bf57054540 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -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'
}
},
@@ -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'
},
@@ -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'
}
@@ -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,
@@ -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'
}
},
@@ -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'
}
@@ -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'
}
}
},
@@ -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'
}
}
},
diff --git a/_config.yml b/_config.yml
index b1cf0caefa..5aa95016c6 100644
--- a/_config.yml
+++ b/_config.yml
@@ -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
diff --git a/docs/jade/customizer-nav.jade b/docs/_jade/customizer-nav.jade
index c4f6ddf105..c4f6ddf105 100644
--- a/docs/jade/customizer-nav.jade
+++ b/docs/_jade/customizer-nav.jade
diff --git a/docs/jade/customizer-variables.jade b/docs/_jade/customizer-variables.jade
index 3c74573be0..3c74573be0 100644
--- a/docs/jade/customizer-variables.jade
+++ b/docs/_jade/customizer-variables.jade
diff --git a/docs/assets/css/src/docs.css b/docs/assets/css/_src/docs.css
index 0957598996..0957598996 100644
--- a/docs/assets/css/src/docs.css
+++ b/docs/assets/css/_src/docs.css
diff --git a/docs/assets/css/src/pygments-manni.css b/docs/assets/css/_src/pygments-manni.css
index 1b3c92cb27..1b3c92cb27 100644
--- a/docs/assets/css/src/pygments-manni.css
+++ b/docs/assets/css/_src/pygments-manni.css
diff --git a/docs/assets/js/src/application.js b/docs/assets/js/_src/application.js
index 678c6eace4..678c6eace4 100644
--- a/docs/assets/js/src/application.js
+++ b/docs/assets/js/_src/application.js
diff --git a/docs/assets/js/src/customizer.js b/docs/assets/js/_src/customizer.js
index cee3c5766d..cee3c5766d 100644
--- a/docs/assets/js/src/customizer.js
+++ b/docs/assets/js/_src/customizer.js
diff --git a/docs/assets/js/vendor/blob.js b/docs/assets/js/_vendor/blob.js
index 307b3afdcd..307b3afdcd 100644
--- a/docs/assets/js/vendor/blob.js
+++ b/docs/assets/js/_vendor/blob.js
diff --git a/docs/assets/js/vendor/filesaver.js b/docs/assets/js/_vendor/filesaver.js
index 8a61f988c2..8a61f988c2 100644
--- a/docs/assets/js/vendor/filesaver.js
+++ b/docs/assets/js/_vendor/filesaver.js
diff --git a/docs/assets/js/vendor/holder.js b/docs/assets/js/_vendor/holder.js
index b291f20f33..b291f20f33 100644
--- a/docs/assets/js/vendor/holder.js
+++ b/docs/assets/js/_vendor/holder.js
diff --git a/docs/assets/js/vendor/jszip.min.js b/docs/assets/js/_vendor/jszip.min.js
index ae4aa7cb57..ae4aa7cb57 100644
--- a/docs/assets/js/vendor/jszip.min.js
+++ b/docs/assets/js/_vendor/jszip.min.js
diff --git a/docs/assets/js/vendor/less.min.js b/docs/assets/js/_vendor/less.min.js
index 3cecd957dc..3cecd957dc 100644
--- a/docs/assets/js/vendor/less.min.js
+++ b/docs/assets/js/_vendor/less.min.js
diff --git a/docs/assets/js/vendor/uglify.min.js b/docs/assets/js/_vendor/uglify.min.js
index d41059b6ad..d41059b6ad 100644
--- a/docs/assets/js/vendor/uglify.min.js
+++ b/docs/assets/js/_vendor/uglify.min.js