From 424dd8bc118b36c9173dbdc05661086c8566fd17 Mon Sep 17 00:00:00 2001 From: Thomas Park Date: Mon, 19 Aug 2013 20:05:19 -0400 Subject: [PATCH] update bootstrap to 3.0.0 final --- bower_components/bootstrap/Gruntfile.js | 42 +- bower_components/bootstrap/README.md | 2 + bower_components/bootstrap/_config.yml | 12 +- .../bootstrap/_includes/footer.html | 3 +- .../bootstrap/_includes/nav-components.html | 12 +- .../bootstrap/_includes/nav-css.html | 21 +- .../_includes/nav-getting-started.html | 11 +- .../bootstrap/_includes/nav-main.html | 2 +- .../bootstrap/_layouts/customize.html | 52 - .../bootstrap/_layouts/default.html | 24 +- bower_components/bootstrap/_layouts/home.html | 13 +- .../bootstrap/assets/css/docs.css | 885 ++-- .../ico/apple-touch-icon-114-precomposed.png | Bin 4881 -> 2939 bytes .../ico/apple-touch-icon-144-precomposed.png | Bin 5659 -> 3614 bytes .../ico/apple-touch-icon-57-precomposed.png | Bin 2939 -> 1577 bytes .../ico/apple-touch-icon-72-precomposed.png | Bin 3468 -> 1932 bytes .../bootstrap/assets/ico/favicon.png | Bin 1919 -> 889 bytes .../bootstrap/assets/js/customizer.js | 205 +- .../bootstrap/assets/js/filesaver.js | 169 + .../bootstrap/assets/js/jquery.bbq.min.js | 1287 ----- .../bootstrap/assets/js/jquery.js | 11 +- .../bootstrap/assets/js/raw-files.js | 3 + bower_components/bootstrap/components.html | 692 ++- bower_components/bootstrap/composer.json | 2 +- bower_components/bootstrap/css.html | 390 +- bower_components/bootstrap/customize.html | 847 ++- .../bootstrap/dist/css/bootstrap-theme.css | 384 ++ .../dist/css/bootstrap-theme.min.css | 1 + .../bootstrap/dist/css/bootstrap.css | 4714 ++++++++++------- .../bootstrap/dist/css/bootstrap.min.css | 2 +- .../fonts/glyphicons-halflings-regular.eot | Bin 0 -> 14079 bytes .../fonts/glyphicons-halflings-regular.svg | 228 + .../fonts/glyphicons-halflings-regular.ttf | Bin 0 -> 29512 bytes .../fonts/glyphicons-halflings-regular.woff | Bin 0 -> 16448 bytes .../bootstrap/dist/js/bootstrap.js | 30 +- .../bootstrap/dist/js/bootstrap.min.js | 2 +- .../bootstrap/examples/carousel/carousel.css | 4 +- .../bootstrap/examples/carousel/index.html | 8 +- .../bootstrap/examples/grid/index.html | 10 + .../examples/jumbotron-narrow/index.html | 14 +- .../jumbotron-narrow/jumbotron-narrow.css | 11 +- .../bootstrap/examples/jumbotron/index.html | 71 +- .../examples/jumbotron/jumbotron.css | 19 - .../examples/justified-nav/index.html | 53 +- .../examples/justified-nav/justified-nav.css | 9 - .../examples/navbar-fixed-top/index.html | 11 +- .../examples/navbar-static-top/index.html | 11 +- .../bootstrap/examples/navbar/index.html | 76 +- .../examples/non-responsive/index.html | 96 + .../non-responsive/non-responsive.css | 117 + .../bootstrap/examples/offcanvas/index.html | 14 +- .../examples/screenshots/carousel.jpg | Bin 142210 -> 82379 bytes .../bootstrap/examples/screenshots/grid.jpg | Bin 162322 -> 100105 bytes .../examples/screenshots/jumbotron-narrow.jpg | Bin 122875 -> 68675 bytes .../examples/screenshots/jumbotron.jpg | Bin 139193 -> 77911 bytes .../examples/screenshots/justified-nav.jpg | Bin 141141 -> 79170 bytes .../examples/screenshots/navbar-fixed.jpg | Bin 64181 -> 38093 bytes .../examples/screenshots/navbar-static.jpg | Bin 65464 -> 39712 bytes .../bootstrap/examples/screenshots/navbar.jpg | Bin 69340 -> 41029 bytes .../examples/screenshots/non-responsive.jpg | Bin 0 -> 61233 bytes .../examples/screenshots/offcanvas.jpg | Bin 202908 -> 112583 bytes .../examples/screenshots/sign-in.jpg | Bin 24724 -> 13648 bytes .../examples/screenshots/starter-template.jpg | Bin 38764 -> 22620 bytes .../screenshots/sticky-footer-navbar.jpg | Bin 71177 -> 39387 bytes .../examples/screenshots/sticky-footer.jpg | Bin 42344 -> 25056 bytes .../bootstrap/examples/screenshots/theme.jpg | Bin 0 -> 95407 bytes .../bootstrap/examples/signin/index.html | 14 +- .../examples/starter-template/index.html | 12 +- .../examples/sticky-footer-navbar/index.html | 12 +- .../examples/sticky-footer/index.html | 12 +- .../bootstrap/examples/theme/index.html | 387 ++ .../bootstrap/examples/theme/theme.css | 14 + .../fonts/glyphicons-halflings-regular.eot | Bin 0 -> 14079 bytes .../fonts/glyphicons-halflings-regular.svg | 228 + .../fonts/glyphicons-halflings-regular.ttf | Bin 0 -> 29512 bytes .../fonts/glyphicons-halflings-regular.woff | Bin 0 -> 16448 bytes .../bootstrap/getting-started.html | 415 +- bower_components/bootstrap/index.html | 7 +- bower_components/bootstrap/javascript.html | 130 +- bower_components/bootstrap/js/dropdown.js | 6 +- bower_components/bootstrap/js/modal.js | 8 +- .../bootstrap/js/tests/unit/modal.js | 19 + .../bootstrap/js/tests/vendor/jquery.js | 11 +- bower_components/bootstrap/js/tooltip.js | 14 +- bower_components/bootstrap/js/transition.js | 2 +- bower_components/bootstrap/less/alerts.less | 18 +- .../bootstrap/less/bootstrap.less | 38 +- .../bootstrap/less/button-groups.less | 15 +- bower_components/bootstrap/less/carousel.less | 7 +- .../bootstrap/less/dropdowns.less | 21 +- bower_components/bootstrap/less/forms.less | 31 +- .../bootstrap/less/glyphicons.less | 232 + bower_components/bootstrap/less/grid.less | 6 +- .../bootstrap/less/jumbotron.less | 21 +- bower_components/bootstrap/less/labels.less | 2 +- bower_components/bootstrap/less/mixins.less | 46 +- bower_components/bootstrap/less/modals.less | 8 + bower_components/bootstrap/less/navbar.less | 293 +- bower_components/bootstrap/less/navs.less | 2 +- bower_components/bootstrap/less/pager.less | 2 +- bower_components/bootstrap/less/panels.less | 34 +- .../bootstrap/less/responsive-utilities.less | 169 +- .../bootstrap/less/scaffolding.less | 45 +- bower_components/bootstrap/less/tables.less | 105 +- bower_components/bootstrap/less/theme.less | 232 + .../bootstrap/less/thumbnails.less | 29 +- bower_components/bootstrap/less/type.less | 4 +- .../bootstrap/less/variables.less | 97 +- bower_components/bootstrap/package.json | 3 +- 109 files changed, 8338 insertions(+), 4983 deletions(-) delete mode 100755 bower_components/bootstrap/_layouts/customize.html create mode 100755 bower_components/bootstrap/assets/js/filesaver.js delete mode 100755 bower_components/bootstrap/assets/js/jquery.bbq.min.js create mode 100755 bower_components/bootstrap/assets/js/raw-files.js create mode 100755 bower_components/bootstrap/dist/css/bootstrap-theme.css create mode 100755 bower_components/bootstrap/dist/css/bootstrap-theme.min.css create mode 100755 bower_components/bootstrap/dist/fonts/glyphicons-halflings-regular.eot create mode 100755 bower_components/bootstrap/dist/fonts/glyphicons-halflings-regular.svg create mode 100755 bower_components/bootstrap/dist/fonts/glyphicons-halflings-regular.ttf create mode 100755 bower_components/bootstrap/dist/fonts/glyphicons-halflings-regular.woff create mode 100755 bower_components/bootstrap/examples/non-responsive/index.html create mode 100755 bower_components/bootstrap/examples/non-responsive/non-responsive.css create mode 100755 bower_components/bootstrap/examples/screenshots/non-responsive.jpg create mode 100755 bower_components/bootstrap/examples/screenshots/theme.jpg create mode 100755 bower_components/bootstrap/examples/theme/index.html create mode 100755 bower_components/bootstrap/examples/theme/theme.css create mode 100755 bower_components/bootstrap/fonts/glyphicons-halflings-regular.eot create mode 100755 bower_components/bootstrap/fonts/glyphicons-halflings-regular.svg create mode 100755 bower_components/bootstrap/fonts/glyphicons-halflings-regular.ttf create mode 100755 bower_components/bootstrap/fonts/glyphicons-halflings-regular.woff create mode 100755 bower_components/bootstrap/less/glyphicons.less create mode 100755 bower_components/bootstrap/less/theme.less diff --git a/bower_components/bootstrap/Gruntfile.js b/bower_components/bootstrap/Gruntfile.js index 576c637..cfefae2 100755 --- a/bower_components/bootstrap/Gruntfile.js +++ b/bower_components/bootstrap/Gruntfile.js @@ -83,6 +83,25 @@ module.exports = function(grunt) { }, src: ['less/bootstrap.less'], dest: 'dist/css/<%= pkg.name %>.min.css' + }, + theme: { + src: ['less/theme.less'], + dest: 'dist/css/<%= pkg.name %>-theme.css' + }, + theme_min: { + options: { + compress: true + }, + src: ['less/theme.less'], + dest: 'dist/css/<%= pkg.name %>-theme.min.css' + } + }, + + copy: { + fonts: { + expand: true, + src: ["fonts/*"], + dest: 'dist/' } }, @@ -108,7 +127,7 @@ module.exports = function(grunt) { validation: { options: { - reset: true, + reset: true }, files: { src: ["_gh_pages/**/*.html"] @@ -136,6 +155,7 @@ module.exports = function(grunt) { grunt.loadNpmTasks('grunt-contrib-clean'); grunt.loadNpmTasks('grunt-contrib-concat'); grunt.loadNpmTasks('grunt-contrib-connect'); + grunt.loadNpmTasks('grunt-contrib-copy'); grunt.loadNpmTasks('grunt-contrib-jshint'); grunt.loadNpmTasks('grunt-contrib-qunit'); grunt.loadNpmTasks('grunt-contrib-uglify'); @@ -145,12 +165,11 @@ module.exports = function(grunt) { grunt.loadNpmTasks('grunt-recess'); grunt.loadNpmTasks('browserstack-runner'); - // Docs HTML validation task - grunt.registerTask('validate-docs', ['jekyll', 'validation']); + grunt.registerTask('validate-html', ['jekyll', 'validation']); // Test task. - var testSubtasks = ['jshint', 'qunit', 'validate-docs']; + 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 @@ -166,11 +185,14 @@ module.exports = function(grunt) { // CSS distribution task. grunt.registerTask('dist-css', ['recess']); + // Fonts distribution task. + grunt.registerTask('dist-fonts', ['copy']); + // Full distribution task. - grunt.registerTask('dist', ['clean', 'dist-css', 'dist-js']); + grunt.registerTask('dist', ['clean', 'dist-css', 'dist-fonts', 'dist-js']); // Default task. - grunt.registerTask('default', ['test', 'dist']); + grunt.registerTask('default', ['test', 'dist', 'build-customizer']); // task for building customizer grunt.registerTask('build-customizer', 'Add scripts/less files to customizer.', function () { @@ -180,7 +202,7 @@ module.exports = function(grunt) { var files = {} fs.readdirSync(type) .filter(function (path) { - return new RegExp('\\.' + type + '$').test(path) + return type == 'fonts' ? true : new RegExp('\\.' + type + '$').test(path) }) .forEach(function (path) { return files[path] = fs.readFileSync(type + '/' + path, 'utf8') @@ -189,7 +211,7 @@ module.exports = function(grunt) { } var customize = fs.readFileSync('customize.html', 'utf-8') - var files = '\n - + + {% endif %} diff --git a/bower_components/bootstrap/_includes/nav-components.html b/bower_components/bootstrap/_includes/nav-components.html index c5ced69..8b239b2 100755 --- a/bower_components/bootstrap/_includes/nav-components.html +++ b/bower_components/bootstrap/_includes/nav-components.html @@ -1,3 +1,11 @@ +
  • + Glyphicons + +
  • Dropdowns
    • diff --git a/bower_components/bootstrap/_includes/nav-css.html b/bower_components/bootstrap/_includes/nav-css.html index 4d2d58d..853b473 100755 --- a/bower_components/bootstrap/_includes/nav-css.html +++ b/bower_components/bootstrap/_includes/nav-css.html @@ -9,9 +9,6 @@
  • Containers
    • -
  • - Glyphicons -
  • Grid system
  • @@ -73,6 +71,17 @@
  • Button tags
    • -
  • Images
    • -
  • Helper classes
    • -
  • Responsive utilities
    • +
  • + Images +
    • +
  • + Helper classes +
    • +
  • + Responsive utilities + +
    • diff --git a/bower_components/bootstrap/_includes/nav-getting-started.html b/bower_components/bootstrap/_includes/nav-getting-started.html index 1cba756..243c05f 100755 --- a/bower_components/bootstrap/_includes/nav-getting-started.html +++ b/bower_components/bootstrap/_includes/nav-getting-started.html @@ -1,7 +1,7 @@
  • Download Bootstrap @@ -18,6 +18,15 @@
  • Disabling responsiveness
    • +
  • + Migrating from 2.x to 3.0 + +
  • Browser support
    • diff --git a/bower_components/bootstrap/_includes/nav-main.html b/bower_components/bootstrap/_includes/nav-main.html index 197bad2..c880c32 100755 --- a/bower_components/bootstrap/_includes/nav-main.html +++ b/bower_components/bootstrap/_includes/nav-main.html @@ -7,7 +7,7 @@ - Bootstrap 3 RC2 + Bootstrap