0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-03 15:24:19 +01:00
Commit Graph

290 Commits

Author SHA1 Message Date
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
9db1de2a3a Update jQuery to v1.11.2. 2015-01-07 00:31:18 +02: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
adaabab81b Revert "Allow multiple delegated tooltip selectors on a node"
This reverts commit 1b3237629a.
This reverts PR #14189 because it caused major regressions.

Fixes #15168.

We'll try to revisit #14167's feature request in Bootstrap v4.

[skip validator]
2014-12-29 20:08:22 -08:00
Chris Rebert
32cb071594 Remove semicolons from #15425 because fat 2014-12-29 18:34:35 -08:00
Chris Rebert
27bfef5b35 Add regression test for #14244.
Special thanks to @programcsharp

[skip validator]
2014-12-29 16:09:37 -08:00
Chris Rebert
05d1877985 update JS to use .{tooltip,popover}-{left,right,top,bottom} 2014-12-29 12:34:09 -08:00
Chris Rebert
6a5bc63649 rename .arrow => .popover-arrow 2014-12-29 12:33:06 -08:00
Chris Rebert
c7ef5810e1 rename .item => .carousel-item 2014-12-17 18:44:55 -08:00
Chris Rebert
a28e25c00b Remove IE8 compat shims from JS visual tests 2014-12-15 11:38:57 -08:00
Dan Dascalescu
2c64fc2c4d Fix copy/paste error 2014-11-28 04:30:04 -08:00
Chris Rebert
bc5a753b67 fix affix-top unit test to properly clean up after itself 2014-11-20 23:26:37 -08:00
Nick O'Donoghue
da79ab9488 add unit test for affix-top for padding issue 2014-11-17 18:17:40 -08:00
Chris Rebert
8008fe707e add unit tests for Carousel's 'wrap' option 2014-11-15 22:37:55 -08:00
Heinrich Fenkart
1d55ada581 Dropdown: ignore keydown events coming from inputs and textareas
Fixes #15084.
2014-11-12 02:01:25 +01:00
Chris Rebert
469dc3ab1f Have Carousel ignore keyboard events from <input>s or <textarea>s; fixes #14991 2014-11-04 16:23:44 -08:00
Heinrich Fenkart
425a985491 Update head of all visual tests to use our basic template 2014-11-05 01:18:11 +01:00
Chris Rebert
4102a67f33 fix typo in comment 2014-10-30 01:47:48 -07:00
Heinrich Fenkart
cf482dbb0b Fix the iOS 8 unit test failures
Resolves #14919.
2014-10-30 09:35:53 +01:00
Heinrich Fenkart
ed3a65f084 Handle collapsed class on triggers even when manually invoked
Fixes #13636.
2014-10-29 04:34:05 +01:00
Heinrich Fenkart
e851b8685a Merge pull request #14457 from hnrch02/button-set-val-after-event-loop
Change value of stateful button after event loop
2014-10-29 04:28:22 +01:00
Chris Rebert
22e1f94b52 Increase timeouts in tooltip unit tests to avoid spurious Sauce failures
Fixes #14851
2014-10-27 15:53:43 -07:00
Heinrich Fenkart
007fbdb66d Remove faulty unit test from 9740d8b
This would only work with transitions but since we disable them for unit tests, this delivers unreliably results.
2014-10-26 04:56:52 +01:00
Heinrich Fenkart
5da85f8e8b Follow-up to 9740d8b: fix small typo 2014-10-26 04:41:47 +01:00
Phil Hughes
9740d8bb69 Fix tooltip occasionally not hiding when using a hide delay
Fixes #14375.
Closes #14519 by merging it.
2014-10-26 04:38:18 +01:00
Andrew S. Brown
1b3237629a Allow multiple delegated tooltip selectors on a node
Fixes #14167.
Closes #14189 by merging it.
2014-10-26 03:51:55 +01:00
Heinrich Fenkart
0e991ccba2 Follow-up to e8af21c: rm unused variable in unit test 2014-10-26 03:16:05 +01:00
Tadeu Zagallo
e8af21cc9d Clear scrollspy selection above first section
Closes #13563 by merging it.
2014-10-26 03:14:08 +01:00
Cameron Little
0755d529c6 Tabs plugin accessibility
Added support for `aria-expanded` toggling via JavaScript. Added
`aria-controls`, `aria-expanded`, `aria-labelledby` to tabs docs.

Added `aria-expanded` unit test for the tabs plugin.

See also #13554.

Closes #14154 by merging it.
2014-10-26 02:25:47 +01:00
Heinrich Fenkart
3c98dd35ba Fix IE8 unit test breakage introduced by #14767 2014-10-22 22:09:58 +02:00
Phil Hughes
ab8dbc214e Implement hide and hidden events for tabs
Closes #14772.
2014-10-22 21:42:35 +02:00
saranya.r
e2cfbd5f2d Fixes tooltip misplacements in scrollable viewports with auto positioning
Fixes #14756.
Closes #14767.
2014-10-22 21:35:44 +02:00
Patrick H. Lauke
e1d40f7633 Add aria-pressed to single toggle buttons
also includes tiny fix/clarification to two existing unit tests for the
.active class, adding data-toggle=“button” explicitly to the tested
buttons

Closes #14819.
2014-10-22 21:02:19 +02:00
Heinrich Fenkart
e811a24118 Don't fire show event if show is prevented because other element is still transitioning
Fixes #14844.
Closes #14845.
2014-10-22 04:25:05 +02:00
fat
4bbe80658a fixes #13816 Modal dialog closes when dragging and releasing mouse button outside dialog 2014-10-09 20:01:51 -07:00
XhmikosR
909a178362 Change Twitter links to use https. 2014-10-07 15:28:41 +03:00
Heinrich Fenkart
61705d35fa Small clean-up in scrollspy unit test 2014-10-07 06:57:46 +02:00
Chris Rebert
d361470487 tooltip unit tests: fix typo in test description 2014-10-03 16:26:53 -07:00
Maarten Van Hoof
44894a40e5 Add missing collapse JS files to dropdown visual test
Closes #14726.
2014-10-03 19:55:13 +02:00
Heinrich Fenkart
038a63b0eb Add keyboard option to carousel
Also adds unit tests for keyboard events.

Fixes #14468.
2014-10-03 05:16:31 +02:00
Jacob
b702889613 Merge pull request #14626 from twbs/carousel-pause-hover-non-mobile
Only enable `pause: hover` for non-touch browsers
2014-10-02 20:09:20 -07:00
Chris Rebert
4d9890ea2e Use container instead of parent for tooltip/popover auto-placement calcs
Fixes #14561. Big thanks to @wickstargazer.

[skip validator]
2014-09-24 20:46:49 -07:00
Heinrich Fenkart
24ae068f21 Tooltip: Rely on getBoundingClientRect for width and height
Fixes #14553.
2014-09-25 01:35:51 +02:00
Heinrich Fenkart
c37c1a6743 Only enable pause: hover for non-touch browsers
Fixes #11967.
2014-09-23 23:34:58 +02:00
Chris Rebert
6f6466330d Make it easier to see failing tests in Sauce screencasts
...by hiding passing tests in the list of tests.
2014-09-17 18:33:39 -07:00
Heinrich Fenkart
3beeb32bb0 Follow-up to #14581: Use div instead of HTML5 section for IE8 2014-09-17 23:33:22 +02:00
saranya.r
db9e8ee813 Fix tooltip misplacement with "auto top"
Fixes #14322.
Closes #14581.
2014-09-17 23:11:04 +02:00
Chris Rebert
73e3db0a2f Must explicitly destroy tooltip in SVG unit test since its container is body.
Leaking tooltips across tests leads to confusion and sadness.
2014-09-15 20:01:06 -07:00
Peter West
4c98507010 Correctly selects arrow placement for a tooltip
Fixes #13696.
Fixes #13696.
Fixes #14197.
Closes #13718.
2014-09-13 04:25:34 +02:00
Heinrich Fenkart
9b9e2f5d13 grunt and missing new line 2014-09-09 01:23:48 +02:00