61 Commits

Author	SHA1	Message	Date
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	169d2a4a78	Merge branch 'master' into v4	2015-06-18 23:56:43 -07:00
Chris Rebert	f1e1411536	bower.json: Add license field ... [ci skip]	2015-04-27 10:49:55 -07:00
Chris Rebert	52d8a0c78e	bower.json: rm moot version field ... Per a325da3d79	2015-04-27 10:44:09 -07:00
Chris Rebert	23445e0cb2	bower.json: set moduleType to globals ... Per 632ff90a2c (commitcomment-10914138) [ci skip]	2015-04-27 10:39:16 -07:00
Chris Rebert	38861984d9	bower.json: Remove bootstrap.css from main ... Per https://github.com/bower/bower.json-spec/pull/43 : > Use source files with module exports and imports over pre-built distribution files. Also, the example in that PR doesn't include /dist/movement.css or /dist/movement.min.css in its `main`. If you have a complaint about this, take it up with the Bower folks: https://github.com/bower/bower.json-spec/issues	2015-04-24 10:20:28 -07:00
Chris Rebert	6cb9d6ce01	bower.json: Remove font files from main ... Per https://github.com/bower/bower.json-spec/pull/43 : > font files [...] are not `main` files as they are not entry-points. If you have a complaint about this, take it up with the Bower folks: https://github.com/bower/bower.json-spec/issues	2015-04-24 10:19:37 -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
Chris Rebert	4d652035dc	v3.3.2 => v3.3.4	2015-03-16 08:39:31 -07:00
Sebastian Nowicki	767f3c87bc	Add woff2 font file to bower main files ... If Bootstrap is installed through bower, the woff2 font file may not be copied over as it's not in the "main" files. The LESS files still reference the font file which results in errors.	2015-01-23 14:24:27 +01: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
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
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
Mark Otto	b648a77ed3	Merge branch 'master' into v4 ... Conflicts: 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/fonts/glyphicons-halflings-regular.eot dist/fonts/glyphicons-halflings-regular.svg dist/fonts/glyphicons-halflings-regular.ttf dist/fonts/glyphicons-halflings-regular.woff docs/_data/glyphicons.yml docs/_includes/components/alerts.html docs/_includes/components/badges.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/labels.html docs/_includes/components/media.html docs/_includes/components/navbar.html docs/_includes/components/navs.html docs/_includes/components/pagination.html docs/_includes/components/panels.html docs/_includes/components/progress-bars.html docs/_includes/css/buttons.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/responsive-utilities.html docs/_includes/css/sass.html docs/_includes/css/tables.html docs/_includes/css/type.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/download.html docs/_includes/getting-started/examples.html docs/_includes/getting-started/whats-included.html docs/_includes/js/affix.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/overview.html docs/_includes/js/tabs.html docs/_includes/nav/components.html docs/_includes/nav/css.html docs/_includes/nav/javascript.html docs/_includes/nav/main.html docs/about.html docs/assets/css/docs.min.css docs/assets/js/customize.min.js docs/assets/js/raw-files.min.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/fonts/glyphicons-halflings-regular.eot docs/dist/fonts/glyphicons-halflings-regular.svg docs/dist/fonts/glyphicons-halflings-regular.ttf docs/dist/fonts/glyphicons-halflings-regular.woff docs/examples/carousel/index.html docs/examples/navbar-fixed-top/index.html docs/examples/navbar-static-top/index.html docs/examples/navbar/index.html docs/examples/non-responsive/index.html docs/examples/non-responsive/non-responsive.css docs/examples/sticky-footer-navbar/index.html docs/examples/theme/index.html fonts/glyphicons-halflings-regular.eot fonts/glyphicons-halflings-regular.svg fonts/glyphicons-halflings-regular.ttf fonts/glyphicons-halflings-regular.woff less/_carousel.less less/_forms.less less/glyphicons.less	2014-11-30 20:17:45 -08:00
Mark Otto	9a7e365c2c	bump version to v3.3.1	2014-11-12 09:03:16 -08:00
Mark Otto	86af1f39ab	Merge branch 'master' into derp ... Conflicts: Gruntfile.js _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 docs/_includes/components/button-groups.html docs/_includes/components/jumbotron.html docs/_includes/components/media.html docs/_includes/components/navs.html docs/_includes/customizer-variables.html docs/_includes/footer.html docs/_includes/getting-started/browser-device-support.html docs/_includes/js/carousel.html docs/_includes/js/dropdowns.html docs/_includes/js/modal.html docs/_includes/js/popovers.html docs/_includes/js/tooltips.html docs/_includes/nav/getting-started.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/browser-bugs.html 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/examples/justified-nav/index.html less/_forms.less less/_tooltip.less less/navs.less less/theme.less	2014-11-09 22:02:53 -08:00
Mark Otto	94b59b57d6	version bump	2014-10-29 08:56:20 -07:00
Mark Otto	d6b0f45fb7	Merge branch 'master' into derp ... 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 docs/_includes/components/dropdowns.html docs/_includes/components/media.html docs/_includes/components/navs.html docs/_includes/components/progress-bars.html docs/_includes/components/responsive-embed.html docs/_includes/css/buttons.html docs/_includes/css/forms.html docs/_includes/css/less.html docs/_includes/css/overview.html docs/_includes/css/responsive-utilities.html docs/_includes/customizer-variables.html docs/_includes/getting-started/browser-device-support.html docs/_includes/getting-started/grunt.html docs/_includes/getting-started/template.html docs/_includes/header.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/nav/components.html docs/_includes/nav/getting-started.html 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/docs.min.js docs/assets/js/raw-files.min.js docs/browser-bugs.html docs/components.html docs/components/navbar.md docs/css.html 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/examples/blog/index.html docs/examples/carousel/index.html docs/examples/cover/index.html docs/examples/dashboard/index.html docs/examples/grid/index.html docs/examples/jumbotron-narrow/index.html docs/examples/jumbotron/index.html docs/examples/justified-nav/index.html docs/examples/navbar-fixed-top/index.html docs/examples/navbar-static-top/index.html docs/examples/navbar/index.html docs/examples/non-responsive/index.html docs/examples/offcanvas/index.html docs/examples/signin/index.html docs/examples/starter-template/index.html docs/examples/sticky-footer-navbar/index.html docs/examples/sticky-footer/index.html docs/examples/theme/index.html docs/examples/tooltip-viewport/index.html docs/getting-started.html docs/javascript.html docs/migration.html less/_animation.less less/_modal.less less/_navbar.less less/_variables.less less/glyphicons.less less/navs.less less/panels.less less/progress-bars.less	2014-10-26 22:31:59 -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
Mark Otto	dae5ec5416	Drop Glyphicons	2014-07-08 00:33:21 -07:00
Mark Otto	c1bd4fca61	only ignore /.*	2014-07-05 21:20:09 -07:00
Mark Otto	ff6b279b3c	bump to v3.2.0	2014-06-26 09:13:24 -07:00
The Big Red Geek	55336e6a9e	added bower reference to main less file	2014-04-11 14:49:52 -07:00
Zlatan Vasović	298427c0e4	Add homepage Bower property	2014-03-24 21:57:46 +01:00
Chris Rebert	1c6d303b76	Merge pull request #13064 from ZDroid/description ... Add Bower package description	2014-03-17 03:26:32 -07:00
Chris Rebert	96525fdec4	move sauce_browsers.yml into /grunt/; fixes #13065	2014-03-16 20:30:50 -07:00
Zlatan Vasović	74eb4882c0	Add Bower package description	2014-03-14 10:55:04 +01:00
Mark Otto	1caeca3e01	Don't ignore every dot file in Bower	2014-03-09 12:31:42 -07:00
Mark Otto	1f148427de	Merge pull request #12891 from ZDroid/bower-json-paths ... Remove ./ from bower.json paths	2014-03-07 01:27:56 -08:00
Chris Rebert	cddf14b32d	add 'keywords' field to bower.json	2014-03-03 14:21:46 -08:00
Zlatan Vasović	269dae0cc8	Remove ./ from bower.json paths	2014-03-01 22:07:33 +01:00
Zlatan Vasović	db4b7553f0	Add bower.json keywords	2014-03-01 21:42:31 +01:00
Mark Otto	88fdd45427	v3.1.1 bump	2014-02-13 01:12:26 -08:00
Mark Otto	1409cde7e8	Bump versions, run grunt	2014-01-30 08:30:37 -08:00
Zlatan Vasović	431c544fbc	Update paths in bower.json ... - Replace `*.html`, `docs/assets` and `examples` with `docs` (new directory) - Instead of `_*`, it's just `_config.yml`, without regex (speeds up bower download a few milliseconds)	2014-01-09 11:20:23 +01:00
Eduardo	9f0afd57f0	updated path docs-assets to docs/assets	2014-01-08 16:43:56 +01:00
Mark Otto	679c786237	roll back version numbers to avoid broken links in docs and readme (fixes #12000)	2013-12-24 12:16:17 -08:00
XhmikosR	b27fecb7a3	bower.json: sort by name.	2013-12-22 08:59:36 +02:00
Mark Otto	e8e60ae4bc	version bump	2013-12-18 14:56:08 -08:00
Mark Otto	e7a56df5a2	Merge pull request #11732 from dak/include-dev-fonts-in-bower ... Don't exclude fonts from bower installs	2013-12-15 14:07:17 -08:00
Zlatan Vasović	a5d9b358ab	Don't ignore Gruntfile, it's required for compile	2013-12-08 13:36:52 +01:00
Zlatan Vasović	c78f3b2712	Drop browserstack.json from bower.json ignore	2013-12-06 22:45:17 +01:00
XhmikosR	68a6e57b15	bower.json: remove trailing spaces.	2013-12-06 11:32:57 +02:00
Derek Kent	b8b250a5d2	Don't exclude fonts from bower installs ... Excluding fonts/ from bower installs causes glyphicons to be unavailable to projects using development Bootstrap LESS files.	2013-12-05 19:05:32 -05:00
Mark Otto	8a74264344	bump version numbers to 3.0.3	2013-12-01 19:31:52 -08:00
Weston Platter	a42d7ff319	explicitly call out font files ... Using wildcards to specify fonts causes errors for other npm modules, EG, https://github.com/blittle/bower-installer/issues/33. Additionally, it’s better to lock down files included in a library.	2013-11-23 12:23:18 -07:00
Chris Rebert	57b59fcfd0	Merge pull request #10353 from rwillrich/ignore-files ... Bower: Ignore development and documentation files on bower.json. Fix #10313	2013-11-14 15:37:22 -08:00