rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-04 16:24:22 +01:00
Code Issues Actions Packages Releases Activity

Merge branch 'master' into gh-pages

Browse Source
This commit is contained in:
Mark Otto 2013-08-19 14:18:28 -07:00
commit 05ace147cb
6 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Gruntfile.js
View File

@ -169,7 +169,7 @@ module.exports = function(grunt) {
grunt.registerTask('validate-html', ['jekyll', 'validation']);
// Test task.
var testSubtasks = ['dist-css', 'jshint', 'qunit'];
var testSubtasks = ['dist-css', 'jshint', 'qunit', 'validate-html'];
// Only run BrowserStack tests under Travis
if (process.env.TRAVIS) {
// Only run BrowserStack tests if this is a mainline commit in twbs/bootstrap, or you have your own BrowserStack key
@ -211,7 +211,7 @@ module.exports = function(grunt) {
}
var customize = fs.readFileSync('customize.html', 'utf-8')
var files = '{% raw %}<!-- generated -->\n<script id="files">\n' + getFiles('js') + getFiles('less') + getFiles('fonts') + '<\/script>\n<!-- /generated -->{% endraw %}'
fs.writeFileSync('customize.html', customize.replace(/<!-- generated -->(.|[\n\r])*<!-- \/generated -->/, '') + files)
var files = getFiles('js') + getFiles('less') + getFiles('fonts')
fs.writeFileSync('assets/js/raw-files.js', files)
});
};

1
_includes/footer.html
View File

@ -14,6 +14,7 @@
<script src="{{ page.base_url }}assets/js/jszip.js"></script>
<script src="{{ page.base_url }}assets/js/uglify.js"></script>
<script src="{{ page.base_url }}assets/js/filesaver.js"></script>
<script src="{{ page.base_url }}assets/js/raw-files.js"></script>
<script src="{{ page.base_url }}assets/js/customizer.js"></script>
{% endif %}

3
assets/js/raw-files.js Normal file
View File

File diff suppressed because one or more lines are too long

8
customize.html
View File

File diff suppressed because one or more lines are too long

1
validation-report.json Normal file
View File

@ -0,0 +1 @@
[{"filename":"_gh_pages/components/index.html","error":false},{"filename":"_gh_pages/css/index.html","error":false},{"filename":"_gh_pages/customize/index.html","error":false},{"filename":"_gh_pages/examples/carousel/index.html","error":false},{"filename":"_gh_pages/examples/grid/index.html","error":false},{"filename":"_gh_pages/examples/jumbotron-narrow/index.html","error":false},{"filename":"_gh_pages/examples/jumbotron/index.html","error":false},{"filename":"_gh_pages/examples/justified-nav/index.html","error":false},{"filename":"_gh_pages/examples/navbar-fixed-top/index.html","error":false},{"filename":"_gh_pages/examples/navbar-static-top/index.html","error":false},{"filename":"_gh_pages/examples/navbar/index.html","error":false},{"filename":"_gh_pages/examples/non-responsive/index.html","error":false},{"filename":"_gh_pages/examples/offcanvas/index.html","error":false},{"filename":"_gh_pages/examples/signin/index.html","error":false},{"filename":"_gh_pages/examples/starter-template/index.html","error":false},{"filename":"_gh_pages/examples/sticky-footer-navbar/index.html","error":false},{"filename":"_gh_pages/examples/sticky-footer/index.html","error":false},{"filename":"_gh_pages/examples/theme/index.html","error":false},{"filename":"_gh_pages/getting-started/index.html","error":false},{"filename":"_gh_pages/index.html","error":false},{"filename":"_gh_pages/javascript/index.html","error":false},{"filename":"_gh_pages/js/tests/index.html","error":false}]

1
validation-status.json Normal file
View File

@ -0,0 +1 @@
{"_gh_pages/components/index.html":true,"_gh_pages/css/index.html":true,"_gh_pages/customize/index.html":true,"_gh_pages/examples/carousel/index.html":true,"_gh_pages/examples/grid/index.html":true,"_gh_pages/examples/jumbotron-narrow/index.html":true,"_gh_pages/examples/jumbotron/index.html":true,"_gh_pages/examples/justified-nav/index.html":true,"_gh_pages/examples/navbar-fixed-top/index.html":true,"_gh_pages/examples/navbar-static-top/index.html":true,"_gh_pages/examples/navbar/index.html":true,"_gh_pages/examples/non-responsive/index.html":true,"_gh_pages/examples/offcanvas/index.html":true,"_gh_pages/examples/signin/index.html":true,"_gh_pages/examples/starter-template/index.html":true,"_gh_pages/examples/sticky-footer-navbar/index.html":true,"_gh_pages/examples/sticky-footer/index.html":true,"_gh_pages/examples/theme/index.html":true,"_gh_pages/getting-started/index.html":true,"_gh_pages/index.html":true,"_gh_pages/javascript/index.html":true,"_gh_pages/js/tests/index.html":true}