Mark Otto
c16fee5efd
Merge branch 'master' into v4
...
Conflicts:
.travis.yml
Gruntfile.js
bower.json
dist/css/bootstrap.css
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
dist/js/bootstrap.js
dist/js/bootstrap.min.js
docs/_data/glyphicons.yml
docs/_includes/components/breadcrumbs.html
docs/_includes/components/button-dropdowns.html
docs/_includes/components/button-groups.html
docs/_includes/components/dropdowns.html
docs/_includes/components/glyphicons.html
docs/_includes/components/labels.html
docs/_includes/components/list-group.html
docs/_includes/components/media.html
docs/_includes/components/navs.html
docs/_includes/components/panels.html
docs/_includes/components/progress-bars.html
docs/_includes/components/thumbnails.html
docs/_includes/components/wells.html
docs/_includes/css/buttons.html
docs/_includes/css/forms.html
docs/_includes/css/helpers.html
docs/_includes/css/images.html
docs/_includes/css/less.html
docs/_includes/customizer-variables.html
docs/_includes/getting-started/accessibility.html
docs/_includes/getting-started/browser-device-support.html
docs/_includes/getting-started/community.html
docs/_includes/getting-started/examples.html
docs/_includes/getting-started/grunt.html
docs/_includes/getting-started/license.html
docs/_includes/getting-started/template.html
docs/_includes/header.html
docs/_includes/js/affix.html
docs/_includes/js/alerts.html
docs/_includes/js/carousel.html
docs/_includes/js/collapse.html
docs/_includes/js/dropdowns.html
docs/_includes/js/modal.html
docs/_includes/js/overview.html
docs/_includes/js/popovers.html
docs/_includes/js/scrollspy.html
docs/_includes/js/tabs.html
docs/_includes/js/tooltips.html
docs/_includes/js/transitions.html
docs/_includes/nav/javascript.html
docs/_layouts/default.html
docs/assets/css/docs.min.css
docs/assets/css/src/docs.css
docs/assets/js/customize.min.js
docs/assets/js/docs.min.js
docs/assets/js/raw-files.min.js
docs/assets/js/vendor/FileSaver.js
docs/assets/js/vendor/autoprefixer.js
docs/assets/js/vendor/uglify.min.js
docs/dist/css/bootstrap.css
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
docs/dist/js/bootstrap.min.js
docs/examples/blog/index.html
docs/examples/carousel/index.html
docs/examples/cover/index.html
docs/examples/dashboard/index.html
docs/examples/narrow-jumbotron/narrow-jumbotron.css
docs/examples/navbar-fixed-top/index.html
docs/examples/navbar-static-top/index.html
docs/examples/non-responsive/index.html
docs/examples/non-responsive/non-responsive.css
docs/examples/theme/index.html
grunt/configBridge.json
js/affix.js
js/carousel.js
js/collapse.js
js/dropdown.js
js/modal.js
js/popover.js
js/scrollspy.js
js/tab.js
js/tests/unit/affix.js
js/tests/unit/button.js
js/tests/unit/carousel.js
js/tests/unit/modal.js
js/tests/unit/tooltip.js
js/tooltip.js
less/badges.less
less/glyphicons.less
less/type.less
less/variables.less
package.json
scss/_dropdown.scss
scss/_forms.scss
test-infra/npm-shrinkwrap.json
2015-03-01 13:44:10 -08:00
Heinrich Fenkart
4345e24479
Use different way to make failing test more visible in Sauce
2015-03-01 09:20:00 +01:00
XhmikosR
b8a0ea1224
Update dependencies.
2015-02-20 11:35:39 +02:00
Chris Rebert
cdd287da0d
Exempt Closure part of Gruntfile from requireCamelCaseOrUpperCaseIdentifiers
...
This allows `grunt jscs:grunt` to succeed.
2015-02-16 17:38:54 -08:00
Chris Rebert
1daca5ac5c
Gruntfile: make JSCS happier
2015-02-16 17:18:16 -08:00
fat
834220ea20
bootstrap onto closure
2015-02-11 11:29:43 -08:00
Chris Rebert
0013483d94
bump grunt-html to ~3.0.0
2015-02-10 12:57:00 -08:00
Chris Rebert
f265fed3eb
account for mq4-hover-shim's renaming & org move
2015-02-04 21:15:01 -08:00
Mark Otto
ea8b51920a
use grunt-html instead of grunt-html-validation because holy shit it's fast
2015-02-04 14:10:35 -08:00
Mark Otto
73b50769d8
Switch to grunt-html over grunt-html-validation.
2015-02-02 04:36:13 +02:00
XhmikosR
03e41b355c
Gruntfile.js: Remove now unneeded validator relaxError option.
2015-01-26 18:02:58 +02:00
Chris Rebert
eaaaa00520
Integrate mq4-hover-hover-shim
2015-01-22 11:37:37 -08:00
XhmikosR
3f512c927b
Add AnchorJS for docs anchors.
2015-01-21 09:50:51 +02:00
Mark Otto
325748ff68
Merge branch 'master' into v4
...
Conflicts:
_config.yml
dist/css/bootstrap-theme.css
dist/css/bootstrap-theme.css.map
dist/css/bootstrap-theme.min.css
dist/css/bootstrap.css
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
dist/js/bootstrap.min.js
docs/_includes/components/thumbnails.html
docs/_includes/css/forms.html
docs/_includes/css/grid.html
docs/_includes/customizer-variables.html
docs/_includes/footer.html
docs/_includes/getting-started/download.html
docs/_includes/getting-started/template.html
docs/_includes/js/overview.html
docs/_includes/js/popovers.html
docs/_includes/js/tooltips.html
docs/assets/css/docs.min.css
docs/assets/js/customize.min.js
docs/assets/js/raw-files.min.js
docs/assets/js/src/customizer.js
docs/dist/css/bootstrap-theme.css
docs/dist/css/bootstrap-theme.css.map
docs/dist/css/bootstrap-theme.min.css
docs/dist/css/bootstrap.css
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
docs/dist/js/bootstrap.js
docs/dist/js/bootstrap.min.js
docs/examples/navbar-fixed-top/index.html
docs/examples/navbar-static-top/index.html
docs/examples/non-responsive/index.html
docs/examples/theme/index.html
grunt/configBridge.json
less/alerts.less
less/badges.less
less/jumbotron.less
less/panels.less
less/tables.less
less/theme.less
less/variables.less
package.json
scss/_button-group.scss
scss/_buttons.scss
scss/_forms.scss
2015-01-19 14:48:12 -08:00
Thomas McDonald
0964504fda
remove less references from package files
...
Closes #62 (of v4)
2015-01-18 19:06:51 -08:00
Chris Rebert
3c6a307011
bump min Chrome in Autoprefixer to v35
2015-01-07 17:49:43 -08:00
Chris Rebert
9d0f6c05f4
Sauce testing: set maxPollRetries to 4 for increased robustness
2015-01-05 12:40:43 -08:00
Zlatan Vasović
576230b92a
Happy New Year 🎅
2015-01-01 01:23:48 +01:00
Chris Rebert
45f5841785
Merge pull request #15464 from twbs/address-15419
...
Address #15419
2014-12-31 16:11:04 -08:00
Chris Rebert
473c75dc4c
bump min OS X Safari in Autoprefixer config to v7.1
2014-12-30 12:49:46 -08:00
Chris Rebert
96e108f2b2
Revert "remove Glyphicons docs autogeneration from Grunt"
...
This reverts commit 36b5308926#14065 .
Turns out Glyphicons is more active than we'd thought.
2014-12-29 16:54:29 -08:00
Chris Rebert
f91071bc1b
Bump grunt-contrib-cssmin to ~0.11.0
2014-12-28 19:58:29 -08:00
Gleb Mazovetskiy
8a51daf280
Compile with Ruby Sass or libsass.
...
* Separate configs for libsass and sass.
* Sass compiler selected based on `process.env.TWBS_SASS`.
* Travis:
* Use Gemfile to manage ruby dependencies.
* Run core tests with both Sass compilers.
* Only install/cache ruby gems required by the test subset.
* Grunt: `update-gemfile-lock` task a la `update-shrinkwrap`.
2014-12-24 22:21:39 +02:00
Chris Rebert
736b7bdf93
bump min iOS in Autoprefixer config to v7
2014-12-19 18:11:54 -08:00
Chris Rebert
1afc0eec30
Move stuff out of configBridge.json now that the Customizer is kaput
2014-12-16 20:17:54 -08:00
Chris Rebert
e86468702a
Remove IE8 compatibility option from cssmin Grunt task config
2014-12-15 11:28:35 -08:00
Mark Otto
e0a9a7722f
Merge pull request #14 from twbs/nuke_customizer
...
Nuke the customizer
2014-12-11 12:21:05 -08:00
Mark Otto
95da2a9428
nuke the customizer
2014-12-10 13:51:43 -08:00
XhmikosR
71f6dd25fc
Add grunt-contrib-compress.
...
Now, the zip file is created when running `grunt prep-release`.
[ci skip]
2014-12-09 07:53:11 +02:00
Chris Rebert
5a986744f7
add test-scss Grunt task
2014-12-08 19:02:25 -08:00
Chris Rebert
1f6f95a245
grunt-saucelabs now uses throttled instead of concurrency
...
[skip validator]
2014-12-08 14:58:06 -08:00
Gleb Mazovetskiy
7fe70cb083
Disable source comments
...
Require latest grunt-sass, bumped dep
2014-12-05 10:53:14 +00:00
Mark Otto
c80b7e468a
bit of cleanup
2014-12-02 14:03:43 -08:00
Mark Otto
27df020852
convert to scss
2014-12-02 14:02:35 -08:00
Chris Rebert
a527aaa114
Whitelist <li role="separator">...</li>
...
Refs https://www.w3.org/Bugs/Public/show_bug.cgi?id=27120
Refs #15263
[skip sauce]
2014-12-02 12:56:30 -08:00
Mark Otto
4bba2d0e0c
fix more broke shit, run grunt
2014-11-30 20:29:47 -08:00
XhmikosR
cb29c9a41d
Add a target to generate the gh-pages files.
...
It sets `github: true` for us.
2014-11-20 08:02:05 +02:00
Chris Rebert
db95e0bd01
disable core tests for Savage builds
2014-11-19 16:00:46 -08:00
Heinrich Fenkart
ff5f9db68e
HTML validation: No longer relax the X-UA-Compatible error
...
The validator no longer complains about it unless the value is different from `content=IE=edge`, see https://www.w3.org/Bugs/Public/show_bug.cgi?id=27091
2014-11-10 20:02:06 +01:00
Heinrich Fenkart
30df201abc
Use a Jekyll plugin instead of the copy:configBridge grunt task
2014-11-05 18:35:13 +01:00
Heinrich Fenkart
d107004278
Remove duplicate code from Customizer/Gruntfile by sharing it
2014-11-04 12:35:38 +01:00
XhmikosR
a515191afd
Customizer: include the minified files only on GitHub pages.
2014-10-29 07:30:57 +02:00
Mark Otto
0521913a99
Merge pull request #13824 from jsdf/node-requirable
...
Allow npm package to be resolved via node module resolution
2014-10-25 19:43:05 -07:00
Heinrich Fenkart
1604af041b
Add jQuery version check to existing jQuery presence check
...
Fixes #14809 .
Closes #14825 .
2014-10-23 05:57:15 +02:00
XhmikosR
924c68f8bb
Update FileSaver.js v2014-08-29.
2014-10-09 08:16:32 +03:00
XhmikosR
7ded2d185d
Update Blob.js to v2014-07-24.
2014-10-09 08:16:31 +03:00
Chris Rebert
0013f12989
fix #14609
2014-09-17 17:36:07 -07:00
vsn4ik
1965f032ca
Gruntfile.js: Simplify copy task.
2014-08-30 01:20:48 +04:00
James Friend
015ee2ed74
pulled output path out to gruntfile
2014-08-28 09:39:41 +08:00
James Friend
9aeaf19b1d
Merge remote-tracking branch 'upstream/master' into node-requirable
...
Conflicts:
Gruntfile.js
2014-08-28 09:32:08 +08:00
