rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-11-29 11:24:18 +01:00
Code Issues Actions Packages Releases Activity
17,971 Commits 108 Branches 89 Tags 547 MiB
3574af5231
Commit Graph

527 Commits

Author SHA1 Message Date
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
Chris Rebert
eefa0ada96 Merge pull request #15908 from kkirsche/bumpMarkdownIt 
Bump markdown-it to ^3.0.7
 2015-02-24 15:55:26 -08:00
Chris Rebert
e17600e648 Sync package.json with a1fd86cdf9 2015-02-24 15:23:56 -08:00
Kevin Kirsche
2aab06bbaa Bump markdown it to 3.0.7 
Bump markdown it to 3.0.7

3.0.7 / 2015-02-22

Match table columns count by header.
Added basic CLI support.
Added \v \f to valid whitespaces.
Use external package for unicode data (punctuation).
 2015-02-24 17:20:29 -05:00
Chris Rebert
7f7c7901ae bump time-grunt to ^1.1.0 2015-02-24 14:14:59 -08:00
Chris Rebert
65d209e257 bump grunt-saucelabs to ~8.6.0 2015-02-22 18:42:23 -08:00
XhmikosR
b8a0ea1224 Update dependencies. 2015-02-20 11:35:39 +02:00
XhmikosR
be9d1f436e Specify the files to include in the npm package. 2015-02-16 21:36:41 -08:00
XhmikosR
b9aad573f9 Travis: test against node.js 0.12. 2015-02-16 21:09:32 -08:00
Chris Rebert
c12c439171 bump grunt-sass to ~0.18.0 2015-02-16 17:12:22 -08:00
Chris Rebert
6b61bf4762 bump grunt-jscs to ~1.5.0 2015-02-16 17:08:27 -08:00
XhmikosR
101cf6b1c0 Specify the files to include in the npm package. 2015-02-15 11:43:36 +02:00
XhmikosR
3b783bd0b5 package.json: change the engine version to >= 0.10.1. 2015-02-14 14:32:16 +02: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
XhmikosR
c388870cef Downgrade grunt-contrib-cssmin. 
v0.12.0-v0.12.1 breaks paths in URL.
 2015-02-10 10:49:59 +02:00
XhmikosR
a3419df829 Bump devDependencies. 2015-02-10 08:30:51 +02: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
420088d316 Bump load-grunt-tasks. 2015-01-30 15:13:24 +02:00
Chris Rebert
50a3e579ae update devDependencies 
upgrade grunt-contrib-jshint to ~0.11.0
upgrade load-grunt-tasks to ~3.0.0
 2015-01-23 15:59:37 -08:00
Chris Rebert
eaaaa00520 Integrate mq4-hover-hover-shim 2015-01-22 11:37:37 -08:00
Chris Rebert
9238337cbb Merge branch 'master' into v4 2015-01-21 13:00:12 -08:00
Chris Rebert
30b74105dd remarkable -> markdown-it 2015-01-20 13:04:55 -08:00
Chris Rebert
429809c9cc update grunt-saucelabs to ~8.5.0 2015-01-20 12:49:08 -08: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
XhmikosR
fbc220defd Update devDependencies. 2015-01-19 19:20:13 +02:00
Mark Otto
c683e7dea7 bump versions 2015-01-19 08:32:13 -08:00
Chris Rebert
1e5ce1e1a9 Temporarily revert "Rename scss/bootstrap.scss -> scss/_bootstrap.scss" 
This reverts commit 2916ac43ed.
This reverts commit 3d635f3079.
This reverts commit 61a2120557.

This change broke the Grunt build.
 2015-01-18 15:00:58 -08:00
Chris Rebert
61a2120557 fix main SCSS file paths 
Fixes 2916ac43ed errata
FYI @glebm
 2015-01-18 14:29:53 -08:00
XhmikosR
f5a5621af2 Update devDependencies. 2015-01-16 17:49:58 +02:00
Gleb Mazovetskiy
2916ac43ed Rename scss/bootstrap.scss -> scss/_bootstrap.scss 
This is required for Compass compatibility. See
https://github.com/twbs/bootstrap-sass/issues/694

Also updates bower.json and package.json references to the main Sass
file.
 2015-01-15 21:20:40 +00:00
Chris Rebert
b24e6cf2ed bump grunt-contrib-less to ~1.0.0 2015-01-07 17:43:19 -08:00
Chris Rebert
7f65b71cc3 bump grunt-banner to ~0.3.0 2015-01-05 16:29:52 -08:00
Chris Rebert
e0b5de6ab1 bump grunt-autoprefixer to ~2.1.0 2015-01-05 16:29:17 -08:00
Mark Otto
0e5d17d5f6 Merge branch 'master' into v4 
Conflicts:
	Gruntfile.js
	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/_data/glyphicons.yml
	docs/_includes/components/alerts.html
	docs/_includes/components/badges.html
	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/input-groups.html
	docs/_includes/components/jumbotron.html
	docs/_includes/components/labels.html
	docs/_includes/components/list-group.html
	docs/_includes/components/media.html
	docs/_includes/components/navbar.html
	docs/_includes/components/navs.html
	docs/_includes/components/page-header.html
	docs/_includes/components/pagination.html
	docs/_includes/components/panels.html
	docs/_includes/components/progress-bars.html
	docs/_includes/components/responsive-embed.html
	docs/_includes/components/thumbnails.html
	docs/_includes/components/wells.html
	docs/_includes/css/buttons.html
	docs/_includes/css/code.html
	docs/_includes/css/forms.html
	docs/_includes/css/grid.html
	docs/_includes/css/helpers.html
	docs/_includes/css/images.html
	docs/_includes/css/less.html
	docs/_includes/css/tables.html
	docs/_includes/css/type.html
	docs/_includes/customizer-variables.html
	docs/_includes/getting-started/accessibility.html
	docs/_includes/getting-started/disabling-responsiveness.html
	docs/_includes/getting-started/download.html
	docs/_includes/getting-started/whats-included.html
	docs/_includes/js/alerts.html
	docs/_includes/js/buttons.html
	docs/_includes/js/carousel.html
	docs/_includes/js/collapse.html
	docs/_includes/js/modal.html
	docs/_includes/js/overview.html
	docs/_includes/js/popovers.html
	docs/_includes/js/tabs.html
	docs/_includes/js/tooltips.html
	docs/_includes/nav/components.html
	docs/_includes/nav/javascript.html
	docs/_jade/customizer-variables.jade
	docs/_layouts/default.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/customize.html
	docs/dist/css/bootstrap-theme.css.map
	docs/dist/css/bootstrap.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
	less/glyphicons.less
	less/mixins/vendor-prefixes.less
	less/navbar.less
	less/popovers.less
	less/tables.less
	less/theme.less
	less/tooltip.less
	less/variables.less
	package.json
	scss/_carousel.scss
	scss/_close.scss
	scss/_forms.scss
	test-infra/npm-shrinkwrap.json
 2015-01-03 20:08:58 -08:00
Chris Rebert
2166f238d7 Merge pull request #15456 from twbs/bump-clean-css 
Bump grunt-contrib-cssmin to ~0.11.0
 2014-12-30 00:12:38 -08:00
Chris Rebert
9867b1d49e bump grunt-jscs to ~1.1.0 2014-12-29 14:16:00 -08:00
Chris Rebert
880642ee62 update devDependencies to match upstream 2014-12-29 14:14:57 -08:00
Chris Rebert
995c768330 bump grunt-jscs to ~1.1.0 2014-12-29 11:57:56 -08:00
Chris Rebert
f91071bc1b Bump grunt-contrib-cssmin to ~0.11.0 2014-12-28 19:58:29 -08:00
Chris Rebert
139226157e bump grunt-contrib-uglify to ~0.7.0 2014-12-28 19:47:46 -08:00
Chris Rebert
f5dad0fa39 bump grunt-contrib-compress to ~0.13.0 2014-12-28 18:59:49 -08:00
Chris Rebert
b282e8a01f bump grunt-contrib-jade to ~0.14.0 2014-12-28 18:53:55 -08:00
Chris Rebert
93cd02cd29 bump load-grunt-tasks to ~2.0.0 2014-12-28 18:43:47 -08:00
Chris Rebert
2879049163 bump remarkable to ~1.6.0 2014-12-28 18:25:49 -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
33cbf2142b bump grunt-saucelabs to ~8.4.0 
[skip validator]
 2014-12-12 14:18:25 -08:00
Chris Rebert
74df3175b9 bump remarkable to ~1.5.0 2014-12-12 13:42:43 -08:00
Chris Rebert
f2ecc77562 use npm-shrinkwrap ^200.0.0 ; fixes #15279 2014-12-12 13:21:49 -08:00
XhmikosR
762acc826f Merge pull request #15293 from twbs/grunt-contrib-compress 
Add grunt-contrib-compress.
 2014-12-09 10:19:05 +02:00
XhmikosR
afa46515d0 Update glob. 2014-12-09 07:59:57 +02: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
405410a924 Travis: install scss-lint 2014-12-08 18:34:15 -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
XhmikosR
61bbe74df1 Update devDependencies. 2014-11-30 12:51:16 +02:00
Chris Rebert
a7682e3fde bump remarkable devDependency to ~1.4.1 
[skip sauce]
 2014-11-13 13:53:40 -08:00
XhmikosR
13d2a03379 Pin npm-shrinkwrap to v5.0.0 so that it works with npm 2.x. 
Fixes #15105.
 2014-11-13 22:01:12 +02:00
Mark Otto
9a7e365c2c bump version to v3.3.1 2014-11-12 09:03:16 -08:00
XhmikosR
07c1881bc2 Update npm-shrinkwrap. 2014-11-12 09:51:28 +02:00
XhmikosR
7047f9df14 Update devDependencies. 2014-11-10 12:54:23 +02:00
Mark Otto
34c2f46c8b Merge branch 'master' into v3.3.0 2014-10-29 09:45:09 -07:00
Mark Otto
22baa8153b fixes #14911: bump dependencies to fix customizer text from being cut shor 2014-10-29 09:42:00 -07:00
Mark Otto
94b59b57d6 version bump 2014-10-29 08:56:20 -07:00
jonschlinkert
3e9b461766 Replaces markdown.js with [remarkable](https://github.com/jonschlinkert/remarkable). 
- remarkable has 100% support for [commonmark](http://jgm.github.io/CommonMark/spec.html)
  - [faster](https://github.com/jonschlinkert/remarkable/tree/master/benchmark)
  - easier to monkeypatch. this is a goal of ours, might be useful to you at some point given the custom tokenizing/parsing you're doing for documentation.
 2014-10-26 06:38:10 -04: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
XhmikosR
0ad97ab446 Update node dependencies. 2014-10-25 14:12:20 +03:00
XhmikosR
d59b235242 Update node dependencies. 2014-10-23 13:26:48 -07:00
Daijiro Wachi
2b70f94b15 Update grunt-contrib-jade version 2014-10-02 13:30:36 +09:00
XhmikosR
e26fcf470f Update dependencies. 
Close #14664.
 2014-09-25 18:39:42 +03:00
XhmikosR
5befcb991c Update dependencies. 2014-09-08 09:03:26 +03:00
XhmikosR
fe896923fc Update grunt-jscs. 2014-08-30 08:43:44 +03:00
James Friend
9aeaf19b1d Merge remote-tracking branch 'upstream/master' into node-requirable 
Conflicts:
	Gruntfile.js
 2014-08-28 09:32:08 +08:00
XhmikosR
701c27e22e Update dev dependencies. 2014-08-26 13:51:05 +03:00
Chris Rebert
b3e8001be2 bump grunt-autoprefixer to ~1.0.0 2014-08-05 18:38:29 -07:00
James Friend
689faaf16f added a separate npm-specific main file 2014-08-05 10:51:31 +08:00
Chris Rebert
460294ff77 bump grunt-saucelabs to ~8.2.0 2014-07-31 13:16:04 -07:00
Chris Rebert
80ca659154 bump grunt-contrib-clean to ~0.6.0 2014-07-31 13:15:27 -07:00
XhmikosR
88b4016ce6 Update all devDependencies. 2014-07-22 08:31:26 +03:00
XhmikosR
7ba5c5d5e4 Update grunt-csscomb. 2014-07-22 08:25:35 +03:00
XhmikosR
503ec4e5db Update dependencies. 2014-07-10 09:58:23 +03:00
XhmikosR
0a8845c3fd Update package.json. 
* "grunt-jscs-checker" was renamed to "grunt-jscs"
* update deps
 2014-07-06 14:25:56 +03:00
XhmikosR
a013c112c4 Update dependencies. 2014-07-01 07:32:50 +03:00
XhmikosR
225351431e Update dependencies. 2014-06-30 18:35:50 +03:00
XhmikosR
fec94e1695 Update "grunt-autoprefixer". 2014-06-27 07:38:46 +03:00
Mark Otto
ff6b279b3c bump to v3.2.0 2014-06-26 09:13:24 -07:00
Chris Rebert
df1aee56df upgrade grunt-saucelabs to ~8.1.0 
update shrinkwrap too
 2014-06-24 12:17:24 -07:00
XhmikosR
dc7da296e4 Update dependencies. 2014-06-24 18:58:38 +03:00
XhmikosR
898328655f Update dependencies. 2014-06-23 03:12:16 +03:00
Chris Rebert
856bc8694c bump npm-shrinkwrap to ~3.1.4 2014-06-19 16:04:40 -07:00
Heinrich Fenkart
7bc8db9558 Bump grunt-jscs-checker to 0.5.1 2014-06-19 21:08:04 +02:00
Chris Rebert
3c4ba2a08c Switch to uber/npm-shrinkwrap for npm-shrinkwrap.json generation 
Instead of our homegrown grunt/shrinkwrap.js
Fixes #13483.
New npm-shrinkwrap.json is human-readable but still in a consistent/stable format.
Should aid debugging, produce better diffs, and be less prone to merge conflicts
 2014-06-19 11:46:37 -07:00
XhmikosR
e42de7511a Update dependencies. 2014-06-17 18:29:17 -07:00
James Friend
33a6932d6f added 'main' field to package.json 2014-06-15 12:53:26 +08:00
Chris Rebert
624800aa4f bump load-grunt-tasks to ~0.5.0 
[skip validator] [skip sauce]
 2014-06-13 12:02:14 -07:00
Chris Rebert
2213a5b756 bump grunt-contrib-connect to ~0.8.0 2014-06-09 17:32:10 -07:00
Chris Rebert
f0c97bf758 bump grunt-saucelabs to ~8.0.2 2014-06-04 12:38:26 -07:00
Chris Rebert
34621740b3 bump grunt-contrib-jade to ~0.12.0 2014-06-04 12:06:47 -07:00
Chris Rebert
094e42883a bump grunt-contrib-qunit to ~0.5.1 2014-06-04 12:06:03 -07:00
Chris Rebert
7b2600cfc5 bump grunt-saucelabs to ~7.0.0 2014-05-23 12:53:12 -07:00
Chris Rebert
8be8fb61bb bump glob to ^4.0.0 2014-05-23 12:29:24 -07:00
Chris Rebert
6fef447a62 bump grunt-saucelabs to v5.1.3 2014-05-13 14:54:41 -07:00
Mark Otto
f5513fd30e nuke rtl 2014-05-12 19:47:53 -07:00
Chris Rebert
150ca95b19 unlock & bump grunt-jscs-checker to ~0.4.3 2014-05-07 13:28:02 -07:00
Chris Rebert
64fdbd7621 bump grunt-jscs-checker to v0.4.1; refs #13512 2014-05-05 12:31:17 -07:00
Chris Rebert
b100e15d41 temporarily lock grunt-jscs-checker to v0.4.0 
Per #13512 & https://github.com/mdevils/node-jscs/issues/357
 2014-05-05 12:08:04 -07:00
Chris Rebert
348e7a011a bump grunt-css-flip to ~0.2.2 2014-05-03 16:43:02 -07:00
XhmikosR
76e717b233 Update dependencies. 2014-04-03 10:52:32 +03:00
XhmikosR
367da423c4 Update "grunt-contrib-concat" dependency. 2014-04-01 08:26:39 +03:00
Chris Rebert
db6572e726 bump patch versions of 3 grunt tasks 2014-03-30 17:26:13 -07:00
Chris Rebert
35d34ccfaa bump grunt-saucelabs to v5.1.1 2014-03-30 17:17:59 -07:00
Chris Rebert
24c5a453b2 use glob instead of fs.readdirSync since /less now has subdirs 2014-03-28 11:12:28 -07:00
XhmikosR
30cc625c5c Update time-grunt to v0.3.1. 2014-03-23 08:13:38 +02:00
XhmikosR
f2952aeccf Update grunt-contrib-less to v0.11.0. 2014-03-20 07:29:07 +02:00
XhmikosR
d475da5b0f Update dependencies. 2014-03-16 06:53:15 +02:00
Chris Rebert
1751922ca0 upgrade to grunt-css-flip v0.2.0 2014-03-12 16:59:58 -07:00
Chris Rebert
327980ddb0 remove unnecessary direct devDependency on css-flip 2014-03-12 16:51:12 -07:00
XhmikosR
d4a4bbb729 Update dependencies. 2014-03-12 20:22:22 +02:00
Zlatan Vasović
f9a56c28db Remove ./ from package.json paths 2014-03-07 23:07:38 +01:00
Bas Bosman
cb7eb674ac Add autoprefixer 2014-03-07 09:01:54 +01:00
XhmikosR
73ad81d89c Add time-grunt plugin. 2014-03-07 08:47:23 +02:00
XhmikosR
589f872d74 Remove duplicate dependency. 2014-03-07 08:45:16 +02:00
XhmikosR
29d2de869e Specify engines in package.json. 
Things don't work with older versions.
 2014-03-07 08:44:43 +02:00
Chris Rebert
56a5d93b82 switch to grunt-css-flip for RTL CSS generation 2014-03-06 12:31:28 -08:00
Zlatan Vasović
58201d7f11 grunt-contrib-jade@0.11.0 2014-03-05 09:25:35 +01:00
Mark Otto
af39290a9d Merge branch 'rtl_via_css_flip' of github.com:twbs/bootstrap into rtl_via_css_flip 
Conflicts:
	Gruntfile.js
	package.json
	test-infra/npm-shrinkwrap.canonical.json
 2014-03-03 21:52:56 -08:00
Chris Rebert
6f1cc694fe add more keywords to package.json & composer.json 2014-03-03 14:22:19 -08:00
Mark Otto
745111ba52 Match docs for description 2014-03-03 14:18:03 -08:00
XhmikosR
cd65e512a2 Update dependencies. 2014-03-02 09:27:01 +02:00
XhmikosR
256baf8026 Update grunt-contib-less. 2014-03-01 20:58:26 +02:00
XhmikosR
63031a3ca5 Bump grunt-jscs-checker. 2014-02-26 19:32:43 +02:00
XhmikosR
db9fca23ff Update load-grunt-tasks. 2014-02-26 19:32:30 +02:00
Chris Rebert
bc8c33c82f Merge pull request #12829 from ZDroid/no-bs-keyword 
Remove bootstrap keyword from package.json
 2014-02-26 09:10:32 -08:00
Zlatan Vasović
db69420d74 Remove bootstrap keyword 2014-02-26 13:46:06 +01:00
Chris Rebert
e40c1e5e6d add Grunt task for css-flip-ing & add RTL to Gruntfile configs 2014-02-25 10:31:02 -08:00
Mark Otto
429fc9331e grunt dist 2014-02-24 19:10:23 -08:00
XhmikosR
af83e569c3 Update grunt-contrib-connect. 2014-02-23 10:56:27 +02:00
XhmikosR
db32afe6cf Update grunt-contrib-cssmin. 2014-02-18 07:40:02 +02:00
Chris Rebert
cdb381bb75 bump grunt-exec to v0.4.5 & add missing tilde to version spec 2014-02-13 13:55:36 -08:00
XhmikosR
2d18944d98 Update dependencies. 2014-02-13 11:12:05 -08:00
Mark Otto
88fdd45427 v3.1.1 bump 2014-02-13 01:12:26 -08:00
Chris Rebert
1e1f510294 rm BrowserStack testing from build 2014-02-11 10:11:38 -08:00
Zlatan Vasović
96fd2dca02 Use license object instead of licenses array 2014-02-06 11:37:39 +01:00
Mark Otto
81d9a46dcd Merge pull request #12534 from Techwraith/patch-1 
Allow the bootstrap package in npm to expose css and less
 2014-02-05 13:54:53 -08:00
Daniel Erickson
fd9b29b43e Allow the bootstrap package in npm to expose css and less 2014-02-02 17:33:40 -08:00
Chris Rebert
00685be0e9 Merge pull request #12445 from twbs/browserstack-runner-update 
update to browserstack-runner v0.1.0
 2014-01-30 13:01:07 -08:00
Chris Rebert
bf0cedc624 update to browserstack-runner v0.1.0 2014-01-30 12:32:30 -08:00
Chris Rebert
dd6bb5a335 update to grunt-saucelabs v5.0.0 2014-01-30 12:30:55 -08:00
Mark Otto
1409cde7e8 Bump versions, run grunt 2014-01-30 08:30:37 -08:00
Chris Rebert
50ad304bb5 Merge pull request #12315 from twbs/use-shrinkwrap 
Do npm caching based on npm-shrinkwrap.canonical.json
 2014-01-26 20:46:14 -08:00
Chris Rebert
5a3f1a90ba fix #12261 2014-01-26 14:22:06 -08:00
Heinrich Fenkart
72568ce588 Update load-grunt-tasks to v0.3.0 2014-01-25 21:03:44 +01:00
Rahul Nawani
6c7db9d56e update browserstack runner package 2014-01-22 21:15:55 +05:30
XhmikosR
9818ad532e Update grunt-contrib-uglify dependency. 2014-01-20 09:37:02 +02:00
Chris Rebert
58c4a8c0f1 bump grunt-contrib-qunit to v0.4.0 2014-01-17 11:56:53 -08:00
Rahul Nawani
a8e14bf1f8 update browserstack-runner package 2014-01-16 11:55:44 +05:30
Chris Rebert
3a97697456 tests: run BrowserStack in parallel with Sauce Labs 
Per https://github.com/twbs/bootstrap/issues/11087#issuecomment-31922999
and internal twbs team discussion.
Effectively reverts the deletions from #11701.
 2014-01-14 14:13:52 -08:00
Mark Otto
e68d3b961e Merge branch 'minify-assets' of https://github.com/XhmikosR/bootstrap into XhmikosR-minify-assets 
Conflicts:
	package.json
 2014-01-11 14:48:04 -08:00
Chris Rebert
7ba6daabfe bump grunt-contrib-jade to v0.9.1 2014-01-08 21:15:37 -08:00
Chris Rebert
39861714a8 Use JS & Jade to generate the customizer variables form HTML from variables.less; fixes #11095 
also updates variables file organization (courtesy @mdo)
 2014-01-08 12:41:51 -08:00
XhmikosR
f00bbdd994 Minify docs CSS too. 2014-01-08 13:41:17 +02:00
Chris Rebert
9ae5d321b5 bump grunt-contrib-less to v0.9.0 2014-01-07 19:50:58 -08:00
Zlatan Vasović
17fb7aee2d Update dependencies (again) 2013-12-31 19:20:57 +01:00