rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-13 01:08:58 +01:00
Code Issues Actions Packages Releases Activity
17,755 Commits 108 Branches 89 Tags 553 MiB
1c92bac655
Commit Graph

492 Commits

Author SHA1 Message Date
Mark Otto
35f80bb12e bump to beta 2017-08-10 20:56:35 -07:00
XhmikosR
f2304e74bd Update devDependencies. (#23264) 2017-08-10 05:41:05 +03:00
Mark Otto
b21fc944b4 Move from dependencies to peerDependencies 2017-08-09 08:32:14 -07:00
XhmikosR
0cb7a1687c Fix sourcemaps for node-sass too. 
Specify `--source-map-contents true` for node-sass and `source-map-inline-sources` for clean-css.

Without this, the sourcemaps weren't found.
 2017-08-09 08:31:25 -07:00
Johann-S
f4f63d8623 Update Popper.js to 1.11.0 (#23162) 2017-07-28 09:34:53 +03:00
Bardi Harborow
a83a0181f9 Errata from #23094. 2017-07-16 15:07:28 +10:00
Bardi Harborow
bde16528d2 Switch to using NPM lock files. 2017-07-16 13:51:16 +10:00
Bardi Harborow
d35020cee8 Update dependencies. 2017-07-16 13:51:16 +10:00
Johann-S
88b2e228c2 Use config file for UglifyJS to ensure same behavior on every environments (#22990) 2017-07-05 09:53:23 +02:00
Johann-S
2cbaefc244 Update Popper.js to 1.10.8 2017-07-04 10:37:44 +02:00
Mark Otto
477ea0c81b add css-docs task to the dist build 2017-06-30 13:35:58 -07:00
Johann-S
4ae7d8170b Revert #22534 - Add grunt to our devDependencies (#22897) 2017-06-22 22:26:13 +02:00
Mark Otto
440af84c7a remove postcss-flexbugs-fixes from build process 2017-06-18 18:17:48 -07:00
Johann-S
11a5ca8ff3 Add back js-lint when we try to build our js 2017-06-16 10:57:13 +02:00
Johann-S
8f431fc5b8 Update Popper.js 1.10.1 2017-06-14 21:13:42 +02:00
Mark Otto
332d882cdb Merge branch 'v4-dev' into v4-docs-streamlined 2017-05-31 20:46:29 -07:00
Brian Ng
4119023482 Use correct version of babel-preset-es2015 
The 7.x-alpha preset won't work with 6.x core.

An alternative would be to bump babel-cli to 7.x-alpha (if you'd like to help us test :D)
 2017-05-31 20:32:25 -07:00
Mark Otto
2fd192968d Merge branch 'v4-dev' into v4-docs-streamlined 2017-05-30 23:31:40 -07:00
CDAGaming
ccd86bdc96 Update Dependencies (REUPLOAD) (#22594) 
* Update Dependencies (REUPLOAD)

Uglify-JS: 2.8.22 > 3.0.3
QUnitJS: 2.3.1 > 2.3.2
PostCSS-CLI: 3.1.1 > 4.0.0
Clean-CSS-CLI: 4.0.12 > 4.1.0
Babel-Eslint: 7.2.2 > 7.2.3
AutoPrefixer: 6.7.7 > 7.0.1

* Updates More Dependencies

Autoprefixer: v7.0.1 > v7.1.1
Clean-CSS-CLI: v4.1.0 > v4.1.3
Node-Sass: v4.5.2 > v4.5.3
PostCSS-FlexBugs-Fixes: v2.1.1 > v3.0.0
Uglify-JS: v3.0.3 > v3.0.11
Signed-off-by: CDAGaming <cstack2011@yahoo.com>

* Update Gem Bundler Dependency

Signed-off-by: CDAGaming <cstack2011@yahoo.com>

* Update Gemfile.lock Dependency

Signed-off-by: CDAGaming <cstack2011@yahoo.com>

* Update QUnit

Signed-off-by: CDAGaming <cstack2011@yahoo.com>

* Update Uglify-JS to v3.0.13

Signed-off-by: CDAGaming <cstack2011@yahoo.com>
 2017-05-30 21:11:56 -07:00
Mark Otto
4d2570d038 drop htmlhint given htmllint gives us most of the coverage we need here 2017-05-29 23:32:28 -07:00
Mark Otto
3e76d65656 Rearrange all the docs to allow for a docs/major.minor/ setup 2017-05-29 23:32:28 -07:00
Mark Otto
7c9efe786a move .scss-lint.yml to route dir instead of symlink (which didn't work) 2017-05-27 17:54:23 -07:00
Mark Otto
793e84400c Add docs-clean task to watch scripts 
Without this, the CSS and JS files don't get copied over to the `docs/dist/` folder during development. I imagine we can simplify this and not run it twice, and instead run it once? Unsure.

/cc @johann-s
 2017-05-27 15:28:41 -07:00
Johann-S
cc303d5d26 Update Popper.js to 1.9.9 2017-05-24 14:57:40 +02:00
Johann-S
dd78950d0a Update Popper.js 1.9.4 2017-05-17 14:22:10 +02:00
Johann-S
21c3864134 Update Popper.js 1.9.3 2017-05-14 11:41:19 +02:00
Johann-S
3cfa5e8c05 Update Popper.js 1.9.1 + Update documentation about Dropdown placement 2017-05-14 11:41:19 +02:00
Johann-S
458b3cc4a3 Update Popper.js 1.8.2 2017-05-14 11:41:19 +02:00
Johann-S
d5fabf8de5 Remove totaly Tether from documentation + dependencies 2017-05-14 11:41:19 +02:00
Johann-S
c4b4d534a4 Remove Tether from package.json + Update Popper 2017-05-14 11:41:19 +02:00
Johann-S
954f482f4a Remove log from WEBrick during js-test-cloud 2017-05-02 15:26:45 +02:00
Johann-S
dbe8e554bb Add watch-css and watch-js + a global watch command 2017-04-29 16:43:51 +02:00
Mark Otto
482052585e don't prefix docs css, it generates .map files and mucks it all up 2017-04-29 16:43:51 +02:00
Mark Otto
03c26407aa watch task docs + css 2017-04-29 16:43:51 +02:00
Johann-S
ebf0c3104e Run js-test locally before js-test-cloud 2017-04-27 23:20:29 +02:00
Johann-S
d336adfafd Fix build by installing grunt dependencies before js-test-cloud 2017-04-27 23:03:17 +02:00
Bardi Harborow
2906b612d5 More minor build tweaks and docs updates. 2017-04-21 21:08:40 +10:00
Bardi Harborow
b4ac48fdec Build system overhaul. 2017-04-20 14:31:22 +10:00
Mark Otto
eae1d38733 Package grunt (#22396) 
Remove docs files and Gruntfile from package managers
 2017-04-10 21:12:24 -07:00
Bardi Harborow
09fb2b9af3 Update dependencies. 2017-03-20 17:37:05 +11:00
Bardi Harborow
348c770a6c Update dependencies. 2017-03-12 14:41:41 +11:00
Bardi Harborow
db23b1f32e Move Jekyll to npm script. 2017-02-25 17:44:26 +11:00
Bardi Harborow
cb87eebcbb Update dependencies. 2017-02-05 23:50:06 +11:00
Bardi Harborow
c5a9ebf576 Move htmllint to npm script. 2017-01-23 20:53:17 +11:00
Mark Otto
4fa7749442 Drop Normalize, port relevant parts to Reboot (#21741) 
* Get this party started by removing mention of Normalize.css

* Nuke the old comment, consolidate to a single line and number as appropriate

* Bring over styles for HTML element from Normalize to Reboot

* Move margin override for body element from Normalize to Reboot

* Drop the block reset for HTML5 elements in IE9- from Normalize given we dropped IE9 support

* Building on previous commit, do the same thing for figure, figcaption, and main

* Remove IE9- display from Normalize given our browser support

* Drop IE8 figure margin because we're IE10+

* No need for the h1 overrides because we reset these font and margin styles anyway in _type.scss already

* Drop Safari 6 b and strong normalization because we're Safari 8+

* Remove mark styles for IE9- from Normalize

* Remove old iOS audio fixes from Normalize

* Remove IE9- display for progress from Normalize

* Remove more IE9- rules from Normalize

* One more IE9- display removal for canvas element

* Move pre overrides from Normalize to Reboot

* Move over some link resets to Reboot, drop others

- Move over background-color and text-decoration
- Drop focus outline change given it affects the offset on hover of
focused links

* Move over more code element resets, consolidate with pre overrides, too

* Move over sub and sup wholesale

* Move over img normalization to Reboot

* Move over SVG override too

* - Drop dupe hidden, but add comment for it
- Move over template
- Move over summary

* Remove bulk of @viewport comment

* edit down that code comment

* consolidate html-based normalizations

* update comments

* Consolidate abbr styles

* move over more type elements

* move over hr changes

* move over form controls and more

* move over button resets

* move over firefox button changes

* move over search changes and more

* we nuke all these styles for fieldsets anyway, so outright remove them

* no need for those, we override them

* move over legend, fieldset, progress

* line break

* delete normalize file

* linting

* update comment

* clarify docs mentions of normalize and reboot

* remove normalize excludes from linter

* remove normalize excludes from cli task

* linting

* callout license since we forked part of normalize

* Improve comments, move table background reset to .table class instead of in reboot

* trailing space
 2017-01-21 14:14:25 -08:00
Bardi Harborow
cdf73209df Fix incorrect docs.min.js bundle source. 2017-01-08 12:14:05 +11:00
Mark Otto
045888fa38 version bump 2017-01-06 08:38:04 -08:00
Bardi Harborow
0ac7eb4fe0 Update dependencies. 2017-01-05 14:39:18 +11:00
Bardi Harborow
450ef91b7d Move node-sass to npm script and drop Ruby Sass. 2017-01-04 12:28:06 +11:00
Bardi Harborow
a8100e1f01 Extend ESLint to cover all JS files and drop JSCS. 2016-12-31 16:49:15 +11:00
Mark Otto
a34cdc0638 bump jquery and grunt-sass 
plus shx? 🤷
 2016-12-27 14:14:18 -08:00
Bardi Harborow
effb2fb4b4 Move uglifyjs to npm script. 2016-12-24 00:34:27 +11:00
Bardi Harborow
6993595341 Move clean-css to npm scripts. 2016-12-23 16:51:36 +11:00
Bardi Harborow
ba86c314a4 Move scss-lint to npm scripts. 2016-12-23 14:26:04 +11:00
Bardi Harborow
26c16743fc Refactor ESLint configuration. 2016-11-24 11:59:55 +11:00
Mark Otto
8ff7edaab4 version bump to alpha 5 2016-10-19 08:27:41 -07:00
Bardi Harborow
d57d5a606b Update dependencies, including Babel to v6 and zeroUnits fix. 2016-10-09 12:15:17 +11:00
Bardi Harborow
2e69dfa8c1 Fix broken/redirected links, moving to HTTPS where possible. (#20557) 2016-10-03 09:55:59 -07:00
Mark Otto
5495a4b3d3 versions 2016-09-05 12:41:44 -07:00
Mark Otto
b821c57278 Follow up to #20394: remove ignore for file that no longer exists 2016-08-21 17:50:34 -07:00
Mark Otto
75715d9d3c Merge pull request #20394 from TrigenSoftware/v4-dev 
Fix package.json
 2016-08-21 17:49:46 -07:00
Mark Otto
1efcbc81f2 Fixes #20385 
Recursive glob action
 2016-07-30 10:44:19 -07:00
Onoshko Dan
1885bfe533 Fix package.json 
For example, `resolve` npm module can't resolve path to bootstrap.
 2016-07-28 23:55:10 +07:00
Mark Otto
24e992a6ff bump versions 2016-07-27 09:31:24 -07:00
Chris Rebert
1a4e48e329 Rename shrinkwrap-related npm script (#20311) 
To avoid infinite recursion in newer npm versions, which added a lifecycle script for `npm shrinkwrap`.
Refs https://github.com/npm/npm/issues/13253
Refs https://github.com/npm/npm/pull/12814

[ci skip]
 2016-07-16 14:12:49 -07:00
Chris Rebert
0cf5204a48 Add HTMLHint to the build; fixes #20297 (#20301) 
[skip sauce]
 2016-07-14 16:22:56 -07:00
XhmikosR
1e01721717 Bump devDependencies. 2016-07-11 02:44:58 +03:00
XhmikosR
e727ca9654 Update devDepedencies. 2016-07-04 12:35:52 +03:00
XhmikosR
a0f10e6dcb Merge pull request #20202 from twbs/windows-doesnt-know-how-to-shot-glob 
Avoid globbing in jscs npm script for Windows compatibility
 2016-06-29 09:30:44 +03:00
Chris Rebert
5d33891c32 Avoid globbing in jscs npm script for Windows compatibility 
Fixes #20197

[skip sauce]
[skip validator]
 2016-06-28 23:25:55 -07:00
XhmikosR
7f6fd5be76 Update devDependencies. 
Only grunt-saucelabs is left in order to update grunt to v1.x.
 2016-06-29 09:00:07 +03:00
Chris Rebert
ed3ba47425 Support jQuery v3 in Bootstrap v4 (#20191) 
* bower.json, package.json: Extend jQuery version ranges to include v3
* NuGet: Bump jQuery to v3.0.0.1
* Docs+Examples: Update jQuery to v3.0.0
* Use jQuery v3.0.0 for JS unit tests
* Update jqueryVersionCheck to allow jQuery v3.x.x
 2016-06-28 22:19:46 -07:00
XhmikosR
dec2695d7e Use shx so that the npm scripts work everywhere the same. 2016-06-28 19:03:19 +03:00
Chris Rebert
a358fc9dc1 Replace grunt-postcss with postcss-cli (#20140) 
Refs #19990
Continues the degruntification process.

Also removes mq4-hover-shim for now,
since it doesn't yet implement the standard PostCSS plugin interface.
 2016-06-20 16:18:21 -07:00
Chris Rebert
143eca3ba9 package.json: engines: Require Node.js >= 4 (#20141) 
Refs #17652
 2016-06-19 22:09:29 -07:00
Chris Rebert
10c9be114b Bump shelljs to ^0.7.0 (#20073) 
[skip sauce]
[skip validator]
 2016-06-04 21:45:59 -07:00
Chris Rebert
eb350d1a7c Upgrade to latest version of JSCS (v3.0.4) (#20070) 
Fixes #20002

[skip sauce]
[skip validator]
 2016-06-04 17:55:21 -07:00
Chris Rebert
0c4abb69e3 Kill the grunt-jscs middleman; use JSCS directly instead (#20069) 
Refs #19990

[skip sauce]
[skip validator]
 2016-06-04 17:46:36 -07:00
Chris Rebert
04165ba6e3 Update ESLint to v2.11.1 (latest stable) (#20068) 
Fixes #19908

[skip sauce]
[skip validator]
 2016-06-04 17:08:59 -07:00
Chris Rebert
abc4ecf670 Update ESLint to v2.10.2 (#20063) 
Refs #19908

[skip sauce]
[skip validator]
 2016-06-04 16:52:06 -07:00
Chris Rebert
d1b8ec85e2 Upgrade ESLint to v2.9.0 (#20047) 
Refs #19908

[skip sauce]
[skip validator]
 2016-06-04 15:07:16 -07:00
Chris Rebert
1f5d8aa4b3 Update ESLint to v2.8.0 (#20045) 
Refs #19908

[skip sauce]
[skip validator]
 2016-06-04 14:52:07 -07:00
Chris Rebert
6c2ba51ba4 Upgrade ESLint to v2.7.0 (#20044) 
Refs #19908

[skip sauce]
[skip validator]
 2016-06-04 14:39:56 -07:00
Chris Rebert
2b16f5c510 Update ESLint to v2.5.3 (#20043) 
Refs #19908.

[skip sauce]
[skip validator]
 2016-06-04 14:28:34 -07:00
Chris Rebert
c5eb5a45e9 Upgrade ESLint to v2.4.0 (#20042) 
Refs #19908.

[skip sauce]
[skip validator]
 2016-06-04 14:13:36 -07:00
Chris Rebert
92ec110f08 Upgrade ESLint to v2.3.0 (#20041) 
Refs #19908

[skip sauce]
 2016-06-04 14:01:12 -07:00
Chris Rebert
ef948ece79 Integrate postcss-flexbugs-fixes into build; fixes #18569 2016-06-04 13:00:37 -07:00
Chris Rebert
166daf498a Upgrade ESLint to v2.2.0 (#20000) 
[skip sauce]
[skip validator]
 2016-05-31 01:27:01 -07:00
Chris Rebert
93f028b8f1 Upgrade babel-eslint to ^6.0.4 
[skip sauce]
[skip validator]
 2016-05-31 01:02:30 -07:00
Chris Rebert
ac25ee7a90 Upgrade ESLint to v2.0.0 
[skip sauce]
[skip validator]
 2016-05-31 00:53:02 -07:00
Chris Rebert
9324da7aeb Upgrade ESLint to v1.10.3 
Refs #19908
 2016-05-31 00:12:17 -07:00
Chris Rebert
00a3e1d9ad Upgrade ESLint to v1.9.0 
Refs #19908
 2016-05-30 23:59:24 -07:00
Chris Rebert
324cbb2280 Upgrade ESlint to v1.7.3 
Enable new rules:
* no-empty-pattern
* no-magic-numbers (exempting 0 and ±1)

Refs #19908

[skip sauce]
[skip validator]
 2016-05-30 23:42:22 -07:00
Chris Rebert
f77d8c91a9 Killed the grunt-eslint middleman; Long live ESLint. 
Refs #19908

[skip sauce]
[skip validator]
 2016-05-30 22:16:32 -07:00
Chris Rebert
a90b36918f Add "The Bootstrap Authors" to copyright notices (#19936) 
❤️❤️❤️ https://github.com/twbs/bootstrap/graphs/contributors
 2016-05-20 09:04:31 -07:00
XhmikosR
ed0c12fd71 Nuke grunt-line-remover. 
Use concat's process function instead.
 2016-04-02 10:03:04 +03:00
XhmikosR
da6674a2b7 Update grunt-html. 
[skip sauce]
 2016-03-24 09:47:01 +02:00
Chris Rebert
768dac2e87 Use vanilla npm shrinkwrap instead of uber/npm-shrinkwrap; fixes #18559 2016-03-23 23:20:38 -07:00
XhmikosR
a277c12214 Update dependencies. 
[ci skip]
 2016-03-19 18:59:22 +02:00
XhmikosR
ae4d774fa5 Remove the now unused glob. 2016-03-15 21:09:10 +02:00
Chris Rebert
5f959f1192 Merge pull request #19427 from twbs/npm-deps 
Add jQuery and Tether to npm dependencies
 2016-03-14 02:21:02 -07:00
XhmikosR
3d5a6a70fc Remove the now unused btoa dependency. 
[skip sauce]
 2016-03-07 11:57:55 +02:00
XhmikosR
2a999c6c2c Bump devDependencies. 
Also switch to `^`.
 2016-03-07 11:55:50 +02:00
Chris Rebert
b2bb83d8f6 Add jQuery and Tether to npm dependencies; fixes #17325 
[skip sauce]
 2016-03-07 01:23:55 -08:00
XhmikosR
dbaf20fc44 Update grunt-jscs. 
[skip sauce]
 2016-03-03 10:37:39 +02:00
Ameya Pandilwar
7a6b5cefb7 Removed unused markdown-it dependency 2016-02-27 18:17:51 -05:00
Charlie Wagner
2580981252 Include all grunt requires files in npm package 2016-02-26 21:36:00 -05:00
XhmikosR
44be1d261c Bump grunt-contrib-concat. 
[skip sauce]
 2016-02-23 09:47:17 +02:00
XhmikosR
9989966dde Update devDependencies. 2016-02-19 13:14:47 +02:00
XhmikosR
c6c2958385 Update grunt-html to v6.0.0. 
Also remove the workaround for the old validator version.

[skip sauce]
 2016-02-19 11:26:54 +02:00
Mark Otto
f25f9bceb1 Remove csscomb (soon replace it with something else) because scsslint has most of it covered already 2016-02-06 18:08:54 -08:00
XhmikosR
7fe2cdde70 Update devDependencies. 
[skip sauce]
 2016-02-06 11:23:17 +02:00
XhmikosR
b952d14c53 Bump grunt-jscs. 2016-01-25 09:17:39 +02:00
XhmikosR
53bc3ffbf3 Update dependencies. 2015-12-24 12:49:50 +02:00
Mark Otto
5d3144e8fb manually bump versions because npm script wasn't working for me 2015-12-08 09:36:08 -08:00
XhmikosR
3cd8bd58e3 package.json: fix duplicate scripts property. 
[skip sauce]
[skip validator]
 2015-12-05 12:07:40 +02:00
Chris Rebert
e95ab5c36e s/grunt-sed/npm script/ ; fixes #18338 
[skip sauce]
[skip validator]
 2015-12-05 01:03:52 -08:00
XhmikosR
28d85ab809 Update grunt-jscs. 2015-12-03 08:51:44 +02:00
XhmikosR
bc2d162fd1 Bump grunt-contrib-uglify. 
[skip sauce]
 2015-11-23 18:51:08 +02:00
XhmikosR
1b645ef686 Update devDependencies. 
Adapt uglify for the new version.
 2015-11-16 10:01:34 +02:00
Bass Jobsen
50c43bc55a Replace grunt-autoprefixer with grunt-postcss + autoprefixer 
Closes #18068
 2015-11-13 01:27:43 -08:00
XhmikosR
5a26a13868 Downgrade grunt-contrib-uglify to fix the comments issue. 
Fixes #18224.

[sauce skip]
 2015-11-12 09:17:26 +02:00
XhmikosR
a8c04056fc Update devDependencies. 
[sauce skip]
 2015-11-11 09:00:19 +02:00
XhmikosR
f564c683f7 Update devDependencies. 
[skip sauce]
 2015-10-29 08:18:37 +02:00
XhmikosR
154ed73181 Update devDependencies. 
[validator skip]
[sauce skip]
 2015-10-24 19:25:22 +03:00
Henry Zhu
8924b5044e update grunt-jscs to 2.1.0 to use jscs 2.x 2015-10-19 08:17:13 -04:00
XhmikosR
fe0ad82159 Update devDependencies. 2015-10-14 00:49:05 +03:00
Chris Rebert
472cb85b82 Merge pull request #17270 from jdanyow/patch-1 
Update jspm package configuration
 2015-10-01 10:30:56 -07:00
Chris Rebert
74cc05c032 Only run htmllint on Travis 
So as to avoid any dependence on Java for normal users of the Gruntfile.

[skip sauce]
 2015-09-25 15:34:31 -07:00
XhmikosR
6f9b0ba6ce Update devDependencies. 2015-09-23 09:39:11 +03:00
XhmikosR
db86b0ff17 Update devDependencies. 2015-09-05 08:13:43 +03:00
Xavier Gallardo
750656fc9c Add a license header to bootstrap.scss 2015-09-02 15:08:21 -04:00
Mark Otto
750295306a Merge pull request #17370 from twbs/v4-dev-xmr-rm-csslint-references 
Remove CSSLint references.
 2015-09-01 20:23:13 -07:00
XhmikosR
48f50ab913 Remove the now unused grunt-contrib-jade references. 
[skip sauce]
[skip validator]
 2015-08-29 18:54:49 +03:00
XhmikosR
73c61199a1 Remove CSSLint references. 2015-08-27 18:49:08 +03:00
XhmikosR
13e33e329c Remove the obsolete JSHint references. 2015-08-27 08:11:11 +03:00
Jeremy Danyow
1ba4577cc6 Update jspm package configuration 
Related to https://github.com/jspm/registry/pull/534
 2015-08-24 17:34:19 -04:00
Mark Otto
cf8bb8882e grunt build control for pushing it all 2015-08-18 22:47:26 -07:00
Jacob Thornton
18ff57a183 js tests passing + eslint 2015-08-18 19:22:46 -07:00
Thomas McDonald
2f56b52542 correct package.json license field 
"bootstrap@4.0.0-alpha license should be a valid SPDX license expression"
 2015-07-25 11:28:00 -07:00
Chris Rebert
62da5947a8 Permanent proper fix for dist-css 
Bump mq4-hover-shim to ^0.2.0

Revert "fix dist css"
This reverts commit b12d4bfa9a.
 2015-05-15 12:12:29 -07:00
fat
ab1578465a grunt test-js, grunt dist-js now working 2015-05-12 16:52:54 -07:00
fat
0724bd91ff es6 alert :| 2015-05-07 12:57:31 -07:00
fat
d1fbe200f4 remove closureness from plugins 2015-05-06 13:34:14 -07:00
Chris Rebert
1e85e0f891 Bump grunt-sass to ^1.0.0 2015-05-06 13:08:39 -07:00
Mark Otto
58082cd83e Merge branch 'master' into v4 
Conflicts:
	.gitignore
	Gruntfile.js
	_config.yml
	dist/css/bootstrap-theme.css
	dist/css/bootstrap-theme.min.css
	dist/css/bootstrap.css
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	dist/js/bootstrap.js
	dist/js/bootstrap.min.js
	docs/_includes/components/navbar.html
	docs/_includes/components/progress-bars.html
	docs/_includes/css/grid.html
	docs/_includes/css/overview.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/disabling-responsiveness.html
	docs/_includes/getting-started/download.html
	docs/_includes/getting-started/examples.html
	docs/_includes/getting-started/license.html
	docs/_includes/getting-started/third-party-support.html
	docs/_includes/js/alerts.html
	docs/_includes/js/buttons.html
	docs/_includes/js/carousel.html
	docs/_includes/js/collapse.html
	docs/_includes/js/dropdowns.html
	docs/_includes/js/modal.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/_includes/nav/main.html
	docs/about.html
	docs/assets/css/docs.min.css
	docs/assets/css/src/docs.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.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/migration.html
	js/affix.js
	js/alert.js
	js/button.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/tests/visual/modal.html
	js/tooltip.js
	less/component-animations.less
	less/jumbotron.less
	less/mixins/background-variant.less
	less/mixins/buttons.less
	less/mixins/responsive-visibility.less
	less/mixins/text-emphasis.less
	less/navbar.less
	less/navs.less
	less/scaffolding.less
	less/tooltip.less
	less/utilities.less
	less/variables.less
	package.json
	scss/_buttons.scss
	scss/_forms.scss
	scss/_modal.scss
 2015-03-29 00:08:54 -07:00
Guy Bedford
09ccd432b8 update jspm configuration 2015-03-18 12:59:55 +02:00
Chris Rebert
4d652035dc v3.3.2 => v3.3.4 2015-03-16 08:39:31 -07:00
XhmikosR
0ca3fa42e8 Bump devDependencies. 2015-03-15 04:26:35 -07:00
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