aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Rebert <[email protected]>2014-03-07 08:47:09 -0800
committerChris Rebert <[email protected]>2014-03-07 08:47:09 -0800
commitb9a0d1e4cd17b26d93fc314cff755a1a459c5f7b (patch)
tree27e8fe61d50df688713751a585ec374793cf307c
parent4356e6c6bd165ac15654b9ae2072ceb58c4e8816 (diff)
parentd08bbdc6ec50baca9e34d2aa6e8bcfc8d6135217 (diff)
downloadbootstrap-b9a0d1e4cd17b26d93fc314cff755a1a459c5f7b.tar.xz
bootstrap-b9a0d1e4cd17b26d93fc314cff755a1a459c5f7b.zip
Merge pull request #12505 from ZDroid/js-cs-hint
Reorganize docs assets
-rw-r--r--Gruntfile.js16
-rw-r--r--_config.yml1
-rw-r--r--docs/assets/css/src/docs.css (renamed from docs/assets/css/docs.css)0
-rw-r--r--docs/assets/css/src/pygments-manni.css (renamed from docs/assets/css/pygments-manni.css)0
-rw-r--r--docs/assets/js/src/application.js (renamed from docs/assets/js/application.js)0
-rw-r--r--docs/assets/js/src/customizer.js (renamed from docs/assets/js/customizer.js)0
-rw-r--r--docs/assets/js/src/ie8-responsive-file-warning.js (renamed from docs/assets/js/ie8-responsive-file-warning.js)5
7 files changed, 12 insertions, 10 deletions
diff --git a/Gruntfile.js b/Gruntfile.js
index 7b5fe1d97..4aaef63ef 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/application.js', 'docs/assets/js/customizer.js']
+ src: 'docs/assets/js/src/*.js'
}
},
@@ -98,7 +98,7 @@ module.exports = function (grunt) {
'ids': false,
'overqualified-elements': false
},
- src: ['docs/assets/css/docs.css']
+ src: 'docs/assets/css/src/docs.css'
}
},
@@ -148,7 +148,7 @@ module.exports = function (grunt) {
'docs/assets/js/vendor/blob.js',
'docs/assets/js/vendor/filesaver.js',
'docs/assets/js/raw-files.min.js',
- 'docs/assets/js/customizer.js'
+ 'docs/assets/js/src/customizer.js'
],
dest: 'docs/assets/js/customize.min.js'
},
@@ -158,7 +158,7 @@ module.exports = function (grunt) {
},
src: [
'docs/assets/js/vendor/holder.js',
- 'docs/assets/js/application.js'
+ 'docs/assets/js/src/application.js'
],
dest: 'docs/assets/js/docs.min.js'
}
@@ -246,8 +246,8 @@ module.exports = function (grunt) {
compatibility: 'ie8'
},
src: [
- 'docs/assets/css/docs.css',
- 'docs/assets/css/pygments-manni.css'
+ 'docs/assets/css/src/docs.css',
+ 'docs/assets/css/src/pygments-manni.css'
],
dest: 'docs/assets/css/docs.min.css'
}
@@ -286,12 +286,12 @@ module.exports = function (grunt) {
examples: {
expand: true,
cwd: 'docs/examples/',
- src: ['**/*.css'],
+ src: '**/*.css',
dest: 'docs/examples/'
},
docs: {
files: {
- 'docs/assets/css/docs.css': 'docs/assets/css/docs.css'
+ 'docs/assets/css/src/docs.css': 'docs/assets/css/src/docs.css'
}
}
},
diff --git a/_config.yml b/_config.yml
index d2e1934d8..c23263958 100644
--- a/_config.yml
+++ b/_config.yml
@@ -16,6 +16,7 @@ encoding: UTF-8
exclude:
- "jade"
+ - "src"
- "vendor"
# Custom vars
diff --git a/docs/assets/css/docs.css b/docs/assets/css/src/docs.css
index aba85096b..aba85096b 100644
--- a/docs/assets/css/docs.css
+++ b/docs/assets/css/src/docs.css
diff --git a/docs/assets/css/pygments-manni.css b/docs/assets/css/src/pygments-manni.css
index 1b3c92cb2..1b3c92cb2 100644
--- a/docs/assets/css/pygments-manni.css
+++ b/docs/assets/css/src/pygments-manni.css
diff --git a/docs/assets/js/application.js b/docs/assets/js/src/application.js
index 678c6eace..678c6eace 100644
--- a/docs/assets/js/application.js
+++ b/docs/assets/js/src/application.js
diff --git a/docs/assets/js/customizer.js b/docs/assets/js/src/customizer.js
index a0e4a28d1..a0e4a28d1 100644
--- a/docs/assets/js/customizer.js
+++ b/docs/assets/js/src/customizer.js
diff --git a/docs/assets/js/ie8-responsive-file-warning.js b/docs/assets/js/src/ie8-responsive-file-warning.js
index 3eee8adaa..986e8b657 100644
--- a/docs/assets/js/ie8-responsive-file-warning.js
+++ b/docs/assets/js/src/ie8-responsive-file-warning.js
@@ -8,5 +8,6 @@
* details, see http://creativecommons.org/licenses/by/3.0/.
*/
// Intended to prevent false-positive bug reports about responsive styling supposedly not working in IE8.
-if (window.location.protocol == 'file:')
- alert("ERROR: Bootstrap's responsive CSS is disabled!\nSee getbootstrap.com/getting-started/#respond-file-proto for details.")
+if (window.location.protocol == 'file:') {
+ alert('ERROR: Bootstrap\'s responsive CSS is disabled!\nSee getbootstrap.com/getting-started/#respond-file-proto for details.')
+}