From 0d59ff81c90a23b3e36283a77b09bfb9643c9062 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Sun, 23 Aug 2015 21:34:47 -0700 Subject: [PATCH 01/21] Clear out non-v4 docs translations After v4.0.0 stable gets released, as existing translations get updated or completely new v4 translations get created, we can start adding entries back to the list. --- docs/_data/translations.yml | 55 ------------------------------------- 1 file changed, 55 deletions(-) diff --git a/docs/_data/translations.yml b/docs/_data/translations.yml index 62f90537bf..fc44e93043 100644 --- a/docs/_data/translations.yml +++ b/docs/_data/translations.yml @@ -2,58 +2,3 @@ code: zh description: Bootstrap 中文文档 url: http://v4.bootcss.com/ - -- name: Danish - code: da - description: Bootstrap på Dansk - url: http://getbootstrap.dk/ - -- name: French - code: fr - description: Bootstrap en Français - url: http://www.oneskyapp.com/fr/docs/bootstrap/getting-started/ - -- name: German - code: de - description: Bootstrap auf Deutsch - url: http://holdirbootstrap.de/ - -- name: Italian - code: it - description: Bootstrap in Italiano - url: http://www.hackerstribe.com/guide/IT-bootstrap-3.1.1/ - -- name: Korean - code: ko - description: Bootstrap 한국어 - url: http://bootstrapk.com/ - -- name: Brazilian Portuguese - code: pt-BR - description: Bootstrap em Português do Brasil - url: http://bootstrapbrasil.github.io/ - -- name: Russian - code: ru - description: Bootstrap по-русски - url: http://www.oneskyapp.com/ru/docs/bootstrap/ - -- name: Spanish - code: es - description: Bootstrap en Español - url: http://www.oneskyapp.com/es/docs/bootstrap/ - -- name: Turkish - code: tr - description: Türkçe Bootstrap - url: http://www.trbootstrap.com - -- name: Ukrainian - code: uk - description: Bootstrap українською - url: http://twbs.docs.org.ua - -- name: Vietnamese - code: vi - description: Bootstrap bằng tiếng Việt - url: http://getbootstrap.com.vn From 71c595454c679623d9130efd107f6494cadd1205 Mon Sep 17 00:00:00 2001 From: Luca Mussi Date: Tue, 25 Aug 2015 23:10:50 +0200 Subject: [PATCH 02/21] removed font files --- package.js | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/package.js b/package.js index 9b98df9518..0a19795151 100644 --- a/package.js +++ b/package.js @@ -6,20 +6,13 @@ Package.describe({ name: 'twbs:bootstrap', // http://atmospherejs.com/twbs/bootstrap summary: 'The most popular front-end framework for developing responsive, mobile first projects on the web.', - version: '3.3.5', + version: '4.0.0-alpha', git: 'https://github.com/twbs/bootstrap.git' }); Package.onUse(function (api) { api.versionsFrom('METEOR@1.0'); api.use('jquery', 'client'); - api.addFiles([ - 'dist/fonts/glyphicons-halflings-regular.eot', - 'dist/fonts/glyphicons-halflings-regular.svg', - 'dist/fonts/glyphicons-halflings-regular.ttf', - 'dist/fonts/glyphicons-halflings-regular.woff', - 'dist/fonts/glyphicons-halflings-regular.woff2' - ], 'client', { isAsset: true }); api.addFiles([ 'dist/css/bootstrap.css', 'dist/js/bootstrap.js' From 927f0227cfa9429b670571f889307aedbf62dd12 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Tue, 25 Aug 2015 14:14:41 -0700 Subject: [PATCH 03/21] Use non-broken Sass link in docs; fixes part of #17314 [skip sauce] --- docs/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/index.html b/docs/index.html index 03d634695a..de2bcb39b7 100644 --- a/docs/index.html +++ b/docs/index.html @@ -57,7 +57,7 @@ title: Bootstrap · The world's most popular mobile-first and responsive f
Sass support

Preprocessor

-

Bootstrap ships with vanilla CSS, but its source code utilizes Sass, a popular CSS preprocessor. Quickly get started with precompiled CSS or build on the source.

+

Bootstrap ships with vanilla CSS, but its source code utilizes Sass, a popular CSS preprocessor. Quickly get started with precompiled CSS or build on the source.

Responsive across devices From 2a671cc1863b0c4b0000091b210b993f67382b40 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Tue, 25 Aug 2015 14:16:49 -0700 Subject: [PATCH 04/21] migration.md: fix typo in TODO --- docs/migration.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/migration.md b/docs/migration.md index 6141a67f50..7331c85cc7 100644 --- a/docs/migration.md +++ b/docs/migration.md @@ -151,7 +151,7 @@ The following components have been removed in v4.0.0. | Wells | | Cards | | Justified navs | | | -TODO: audit classes in v4 that aren't present in v4 +TODO: audit classes in v3 that aren't present in v4 ### Responsive utilities From 8bc2e217548c40769438158ab122e035b5a38eef Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Tue, 25 Aug 2015 22:51:08 -0700 Subject: [PATCH 05/21] Gruntfile: rm reference to defunct customizer [skip sauce] --- Gruntfile.js | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index a444bd8d89..5308674547 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -190,10 +190,6 @@ module.exports = function (grunt) { src: '<%= concat.bootstrap.dest %>', dest: 'dist/js/<%= pkg.name %>.min.js' }, - customize: { - src: configBridge.paths.customizerJs, - dest: 'docs/assets/js/customize.min.js' - }, docsJs: { src: configBridge.paths.docsJs, dest: 'docs/assets/js/docs.min.js' From 3cc25428be29cb65fcf384ea4a9516c152c1ad78 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Tue, 25 Aug 2015 23:00:18 -0700 Subject: [PATCH 06/21] rm broken bundle update task & defunct custom RubyGem caching scheme [skip sauce] --- .travis.yml | 1 - Gruntfile.js | 11 ----------- test-infra/README.md | 7 ++----- test-infra/S3Cachefile.json | 5 ----- test-infra/gemfiles/core.gemfile | 7 ------- test-infra/gemfiles/core.gemfile.lock | 15 --------------- 6 files changed, 2 insertions(+), 44 deletions(-) delete mode 100644 test-infra/gemfiles/core.gemfile delete mode 100644 test-infra/gemfiles/core.gemfile.lock diff --git a/.travis.yml b/.travis.yml index 37acfc02ae..9bbe2e9787 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,6 @@ node_js: before_install: - travis_retry pip install -r test-infra/requirements.txt --user - rvm install 2.0.0 && rvm use 2.0.0 - - export GEMDIR=$(rvm gemdir) - "export TRAVIS_COMMIT_MSG=\"$(git log --format=%B --no-merges -n 1)\"" - echo "$TRAVIS_COMMIT_MSG" | grep '\[skip validator\]'; export TWBS_DO_VALIDATOR=$?; true - echo "$TRAVIS_COMMIT_MSG" | grep '\[skip sauce\]'; export TWBS_DO_SAUCE=$?; true diff --git a/Gruntfile.js b/Gruntfile.js index 5308674547..7babb0b93f 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -399,14 +399,6 @@ module.exports = function (grunt) { exec: { npmUpdate: { command: 'npm update' - }, - bundleUpdate: { - command: function () { - // Update dev gems and all the test gemsets - return 'bundle update && ' + glob.sync('test-infra/gemfiles/*.gemfile').map(function (gemfile) { - return 'BUNDLE_GEMFILE=' + gemfile + ' bundle update'; - }).join(' && '); - } } }, @@ -531,7 +523,4 @@ module.exports = function (grunt) { done(); }); }); - // Task for updating the cached RubyGem packages used by the Travis build (which are controlled by test-infra/Gemfile.lock). - // This task should be run and the updated file should be committed whenever Bootstrap's RubyGem dependencies change. - grunt.registerTask('update-gemfile-lock', ['exec:bundleUpdate']); }; diff --git a/test-infra/README.md b/test-infra/README.md index ce7d74b658..5235f861cb 100644 --- a/test-infra/README.md +++ b/test-infra/README.md @@ -13,16 +13,13 @@ Similar to git, `s3_cache.py` makes the assumption that [SHA-256 will effectivel ### For Bootstrap specifically -`s3_cache.py` is used to cache the npm packages that our Grunt tasks depend on and the RubyGems that Jekyll depends on. (Jekyll is needed to compile our docs to HTML so that we can run them thru an HTML5 validator.) +`s3_cache.py` is used to cache the npm packages that our Grunt tasks depend on. For npm, the `node_modules` directory is cached based on our `npm-shrinkwrap.json` file. -For RubyGems, the `gemdir` of the current RVM-selected Ruby is cached based on the `pseudo_Gemfile.lock` file generated by our Travis build script. -`pseudo_Gemfile.lock` contains the versions of Ruby and Jekyll that we're using (read our `.travis.yml` for details). - ## Why is `s3_cache.py` necessary? -`s3_cache.py` is used to speed up Bootstrap's Travis builds. Installing npm packages and RubyGems used to take up a significant fraction of our total build times. Also, at the time that `s3_cache.py` was written, npm was occasionally unreliable. +`s3_cache.py` is used to speed up Bootstrap's Travis builds. Installing npm packages used to take up a significant fraction of our total build times. Also, at the time that `s3_cache.py` was written, npm was occasionally unreliable. Travis does offer built-in caching on their paid plans, but this do-it-ourselves S3 solution is significantly cheaper since we only need caching and not Travis' other paid features. diff --git a/test-infra/S3Cachefile.json b/test-infra/S3Cachefile.json index 90eae796dc..5cda49a447 100644 --- a/test-infra/S3Cachefile.json +++ b/test-infra/S3Cachefile.json @@ -3,10 +3,5 @@ "key": "./npm-shrinkwrap.json", "cache": "../node_modules", "generate": "./uncached-npm-install.sh" - }, - "rubygems": { - "key": "$BUNDLE_GEMFILE", - "cache": "../vendor/cache", - "generate": "cd .. ; bundle install --path=\"`pwd`/vendor/cache\"" } } diff --git a/test-infra/gemfiles/core.gemfile b/test-infra/gemfiles/core.gemfile deleted file mode 100644 index 6a83726919..0000000000 --- a/test-infra/gemfiles/core.gemfile +++ /dev/null @@ -1,7 +0,0 @@ -# Ruby Gems for the 'core' set of tests -# Run `grunt update-gemfile-lock` to update to the latest compatible versions - -source 'https://rubygems.org' - -gem 'sass', '~> 3.4.9' -gem 'scss-lint', '~> 0.31' diff --git a/test-infra/gemfiles/core.gemfile.lock b/test-infra/gemfiles/core.gemfile.lock deleted file mode 100644 index 03580d83bb..0000000000 --- a/test-infra/gemfiles/core.gemfile.lock +++ /dev/null @@ -1,15 +0,0 @@ -GEM - remote: https://rubygems.org/ - specs: - rainbow (2.0.0) - sass (3.4.9) - scss-lint (0.31.0) - rainbow (~> 2.0) - sass (~> 3.4.1) - -PLATFORMS - ruby - -DEPENDENCIES - sass (~> 3.4.9) - scss-lint (~> 0.31) From bf31c8b9d9fc48501c642f8ec58abf5dcda7aafa Mon Sep 17 00:00:00 2001 From: David Baughman Date: Tue, 25 Aug 2015 13:43:39 -0700 Subject: [PATCH 07/21] For now, add hacky