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
15,764 Commits 108 Branches 89 Tags 547 MiB
342e19ae89
Commit Graph

198 Commits

Author SHA1 Message Date
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
f30be4a7e5 update shrinkwrap 2016-03-23 23:27:58 -07:00
Chris Rebert
689a7cdf71 update shrinkwrap 2016-03-23 22:44:24 -07:00
XhmikosR
a277c12214 Update dependencies. 
[ci skip]
 2016-03-19 18:59:22 +02:00
Chris Rebert
f06568453e Merge pull request #19553 from twbs/sauce-android 
Add Android to Sauce testing
[skip validator]
 2016-03-15 23:30:23 -07:00
Chris Rebert
e9dc5b0b6a Add Android to Sauce testing 
[skip validator]
 2016-03-15 23:05:02 -07:00
Chris Rebert
73ee051bed Merge pull request #19549 from twbs/v4-dev-xmr-rm-glob 
Remove the now unused glob devDependency
 2016-03-15 22:39:43 -07:00
Chris Rebert
b62d841c1c Use "latest" version specifier (when applicable) in Sauce tests 
Refs http://sauceio.com/index.php/2016/03/new-browser-version-shortcuts/
[skip validator]
 2016-03-15 22:23:30 -07:00
XhmikosR
ae4d774fa5 Remove the now unused glob. 2016-03-15 21:09:10 +02: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
XhmikosR
dbaf20fc44 Update grunt-jscs. 
[skip sauce]
 2016-03-03 10:37:39 +02:00
XhmikosR
ae7a0eb7a6 Update npm-shrinkwrap.json. 
[skip sauce]
 2016-02-28 03:36:52 +02:00
Ameya Pandilwar
7a6b5cefb7 Removed unused markdown-it dependency 2016-02-27 18:17:51 -05:00
Chris Rebert
1c46385fe1 Merge pull request #19294 from twbs/ios-9.2 
Use iOS 9.2 in Sauce tests
 2016-02-23 13:59:02 -08:00
Chris Rebert
1b889d9ed6 Use iOS 9.2 in Sauce tests 
[skip validator]
 2016-02-23 12:49:21 -08:00
Chris Rebert
e2f01db965 Use OS X El Capitan for Sauce tests 
[skip validator]
 2016-02-23 12:46:29 -08:00
Chris Rebert
25e85a2882 Use Windows 10 for Win Chrome+Firefox tests on Sauce Labs 
[skip validator]
 2016-02-23 12:16:26 -08: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
Chris Rebert
b73f2c3830 update shrinkwrap for f25f9bceb1 2016-02-07 00:44:52 -08:00
XhmikosR
7fe2cdde70 Update devDependencies. 
[skip sauce]
 2016-02-06 11:23:17 +02:00
Chris Rebert
da0d1721d2 update shrinkwrap 2016-02-02 22:41:58 -08:00
XhmikosR
c9c413c7a3 Missed shrinkwrap. 
[skip sauce]
 2016-01-25 09:32:22 +02:00
Chris Rebert
b0ab6bbf05 Un-nest Autoprefixer settings in module object 
[skip sauce]
[skip validator]
 2015-12-24 21:32:54 -07:00
Chris Rebert
c9d86ff3a3 Update current Firefox ESR to 38 in Autoprefixer settings 
See https://www.mozilla.org/en-US/firefox/organizations/faq/

[skip sauce]
[skip validator]
 2015-12-24 20:11:12 -07:00
Chris Rebert
e4989bf784 autoprefixer-settings.js: Link to Firefox ESR webpage 
[skip sauce]
[skip validator]
 2015-12-24 19:52:38 -07:00
Bass Jobsen
4445c4f0f3 Move Autoprefixer settings out of Gruntfile.js and into a separate file 
Refs #18584
Closes #18659

[skip sauce]
[skip validator]
 2015-12-24 19:49:26 -07:00
XhmikosR
53bc3ffbf3 Update dependencies. 2015-12-24 12:49:50 +02:00
Chris Rebert
f5e97c16b6 Update shrinkwrap; fixes #18145 2015-12-23 21:26:05 -07:00
Chris Rebert
701513969d grunt/change-version.js: Remove extra parens around function literals because Hound 
[ci skip]
 2015-12-16 21:26:29 -08:00
Chris Rebert
0cd0e66632 grunt/change-version.js: Remove extraneous semicolon 
[ci skip]
 2015-12-16 21:15:33 -08:00
Chris Rebert
55c37c1ec0 grunt/change-version.js: Add missing semicolon 
🏃🏃🏃I don't wanna get diabetes. 🏥
Obey The Mickens!: https://vimeo.com/111122950#t=14m9s

[ci skip]
 2015-12-16 21:13:04 -08:00
Chris Rebert
5cb503e630 grunt/change-version.js:replaceRecursively(): Use accidentally-unused argument 
How did the linters miss this?

[skip sauce]
[skip validator]
 2015-12-14 01:28:22 -08:00
Chris Rebert
e5266a8058 Update shrinkwrap 2015-12-05 01:28:33 -08: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
Chris Rebert
fcec8c9512 Add MS Edge to Sauce browser tests 
[skip validator]
 2015-11-29 23:51:11 -08:00
Chris Rebert
ac0c2c2aa0 SauceLabs tests: Bump iOS to v9.1 
[skip validator]
 2015-11-29 23:21:57 -08:00
Chris Rebert
7f98ad06fc Update shrinkwrap 2015-11-29 16:58:21 -08:00
XhmikosR
bc2d162fd1 Bump grunt-contrib-uglify. 
[skip sauce]
 2015-11-23 18:51:08 +02:00
Chris Rebert
9a5222ca31 Docs: Separate Tether out from docs.min.js 
We can't include it in docs.min.js because docs.min.js includes application.js,
application.js depends on bootstrap.js,
and the tooltip portion of bootstrap.js depends on Tether.

So instead, we need to load Tether separately before bootstrap.js

[skip sauce]
 2015-11-19 01:04:34 -08:00
XhmikosR
1b645ef686 Update devDependencies. 
Adapt uglify for the new version.
 2015-11-16 10:01:34 +02:00
Chris Rebert
a80f4e2e3c Update shrinkwrap 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
Chris Rebert
4e90b944ea update shrinkwrap 2015-10-29 14:12:37 -07:00
XhmikosR
f564c683f7 Update devDependencies. 
[skip sauce]
 2015-10-29 08:18:37 +02:00
XhmikosR
b0aa10219c Merge pull request #17494 from twbs/v4-dev-xmr-jquery-2.x 
Switch to jQuery 2.x.x.
 2015-10-26 23:26:02 +02:00
XhmikosR
154ed73181 Update devDependencies. 
[validator skip]
[sauce skip]
 2015-10-24 19:25:22 +03:00
XhmikosR
9eded912a0 Make jQuery 2.0 the minimum supported version. 2015-10-24 19:09:33 +03:00
XhmikosR
c343b9f59d Replace ZeroClipboard with clipboard.js. 
Things left:
1. clear the selection after copy
2. add messages for success and error
 2015-10-24 19:01:02 +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
c8cc0a7f9a Update shrinkwrap 2015-09-25 15:34:55 -07:00
Chris Rebert
f22f7beead Move {test-infra=>grunt}/npm-shrinkwrap.json 2015-09-23 23:26:23 -07:00
XhmikosR
fc35ea815e grunt/configBridge.json: Remove unused autoprefixer config. 
[ci skip]
 2015-08-30 00:05:02 +03:00
XhmikosR
3fef66eaf5 Fix the JS errors due to jekyll-search. 
1) Update it to v1.0.8
2) Include jekyll-search where it's used only

[ci skip]
 2015-08-28 14:28:47 +03:00
XhmikosR
1029240b2d Update Anchor.js to v1.2.1. 
[ci skip]
 2015-08-27 08:14:39 +03:00
XhmikosR
13e33e329c Remove the obsolete JSHint references. 2015-08-27 08:11:11 +03:00
XhmikosR
606393502d Specify Internet Explorer 9 as the minimum supported version. 2015-08-25 18:52:27 +03:00
XhmikosR
108ef992d9 grunt/bs-commonjs-generator.js: reapply the fix for Windows slashes. 
[ci skip]
 2015-08-25 08:27:01 +03:00
Jacob Thornton
23d05f1585 get the js working for docs 2015-08-12 19:59:55 -07:00
Thomas McDonald
0ef0825d01 specify expanded output style for generated css with libsass 
(also fix license banner generator bug)
 2015-08-09 23:16:43 -07:00
Mark Otto
1ddc3f5e21 Merge branch 'master' into v4m 2015-08-04 22:29:45 -07:00
Chris Rebert
9b1a213cf7 Bootstrap v3 does not currently claim to be compatible with jQuery v3; closes #16834 
[skip sauce]
[skip validator]
 2015-07-27 16:35:04 -07:00
Mark Otto
bc29c016b7 Merge branch 'v4' into v4_builds 2015-06-19 16:26:33 -07:00
Mark Otto
169d2a4a78 Merge branch 'master' into v4 2015-06-18 23:56:43 -07:00
Mark Otto
8410afe0e1 Create new stylesheets for optional builds and add them to Gruntfile tasks 2015-06-18 10:19:50 -07:00
fat
dafdd180cd add umd module support in dist 2015-05-13 10:13:34 -07:00
fat
d1fbe200f4 remove closureness from plugins 2015-05-06 13:34:14 -07:00
XhmikosR
86400070b5 Bump copyright year. 
[ci skip]
 2015-04-28 11:40:42 +03:00
XhmikosR
3e7ca3bbc8 Minor lint tweaks. 2015-04-28 11:03:37 +03:00
XhmikosR
69308dc883 Update Holder.js to v2.6.0. 
[ci skip]
 2015-04-23 09:18:45 +03:00
Chris Rebert
ffe646bb08 Sauce tests: upgrade iOS to v8.2 
[skip validator]
 2015-04-07 13:00:52 -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
9bdaf03607 Use OS X 10.10 for Sauce iPhone simulator 
[skip validator]
 2015-02-22 19:01:36 -08:00
XhmikosR
3f512c927b Add AnchorJS for docs anchors. 2015-01-21 09:50:51 +02:00
Chris Rebert
30b74105dd remarkable -> markdown-it 2015-01-20 13:04:55 -08:00
Chris Rebert
0dc8395590 use strict mode for jqueryVersionCheck; fixes #15535 2015-01-13 12:21:32 -08:00
Thomas McDonald
d2f29fd649 remove unused font files 2015-01-09 10:15:32 +00: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
57a64be749 Minor fix to Glyphicons data generator 2014-12-29 17:00:44 -08:00
Chris Rebert
96e108f2b2 Revert "remove Glyphicons docs autogeneration from Grunt" 
This reverts commit 36b5308926.
This reverts PR #14065.

Turns out Glyphicons is more active than we'd thought.
 2014-12-29 16:54: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
Mark Otto
73e59c26e6 basic docs search 2014-12-24 02:44:38 -08:00
Mark Otto
36a99c68bf restore configbridge to footer files, update paths 2014-12-19 00:35:54 -08:00
Chris Rebert
7d2b64cbc5 Merge pull request #36 from twbs/trim-config-bridge 
Move stuff out of configBridge.json now that the Customizer is kaput
 2014-12-17 22:36:25 -08:00
Chris Rebert
f24a1cb28d remove remaining remnants of the Customizer 2014-12-17 13:44:52 -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
7d8bad586b Merge pull request #34 from twbs/sauce-android-notes 
update Android comments in sauce_browsers.yml
 2014-12-16 19:51:48 -08:00
Chris Rebert
35db839149 update Android comments in sauce_browsers.yml 2014-12-16 19:50:33 -08:00
Chris Rebert
e444c2c58f remove IE8 from Sauce tests 2014-12-16 19:21:48 -08:00
Chris Rebert
57705e7d85 bump min Firefox in Autoprefixer config to v31 (latest ESR) 2014-12-15 18:26:41 -08:00
Chris Rebert
840b9a4c2e bump min IE in Autoprefixer config to v9 2014-12-15 18:02:15 -08:00
Mark Otto
95da2a9428 nuke the customizer 2014-12-10 13:51:43 -08:00
Mark Otto
7a799af939 fixes and grunt 2014-11-30 21:01:50 -08:00
Chris Rebert
a7ae8c91f2 upgrade iOS tests to 8.1 
[skip validator]
 2014-11-15 21:28:11 -08:00