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
XhmikosR
0481ce973f
Fix bogus JSCS warning.
2015-01-16 17:50:05 +02:00
XhmikosR
0e79fe1a9f
Update JSCS config for the new version.
2015-01-16 17:49:58 +02: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
Zlatan Vasović
576230b92a
Happy New Year 🎅
2015-01-01 01:23:48 +01:00
Chris Rebert
adaabab81b
Revert "Allow multiple delegated tooltip selectors on a node"
...
This reverts commit 1b3237629a#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
54b03c27d2
Merge pull request #43 from twbs/popover-arrow
...
rename .arrow => .popover-arrow
2014-12-29 16:01:07 -08:00
Chris Rebert
e26701c04e
JSCS: enable requireSpaceBetweenArguments
...
New rule added in JSCS v1.9.0
Our JS already complies with this.
2014-12-29 14:16:26 -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
2ae4c0b03f
JSCS: enable requireSpaceBetweenArguments
...
New rule added in JSCS v1.9.0
Our JS already complies with this.
2014-12-29 12:02:33 -08:00
Chris Rebert
c7ef5810e1
rename .item => .carousel-item
2014-12-17 18:44:55 -08:00
Chris Rebert
a8299b5b45
Remove ancillary references to IE<9 in comments+docs
2014-12-16 19:06:57 -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
36b4f90f25
Fixes affix-top class not applying
...
Use scrollTop instead of colliderTop which uses the elements
offset().top, as the offset top does not account for padding.
This issue can be replicated by using a navbar-fixed-top and applying
relevant padding to the body. (A navbar-static-top with no padding on
the body does not encounter this issue)
Fixes #15078
Closes #15154 by merging it
2014-11-17 18:17:42 -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
b7398bc9c4
honor wrap option in Carousel.getItemForDirection; fixes #15144
2014-11-15 22:43:20 -08:00
Chris Rebert
8008fe707e
add unit tests for Carousel's 'wrap' option
2014-11-15 22:37:55 -08:00
Heinrich Fenkart
a577f1922e
Collapse: Use $.fn.children instead of > in selector
...
Fixes #15131 .
2014-11-14 15:18:34 +01:00
Mark Otto
9a7e365c2c
bump version to v3.3.1
2014-11-12 09:03:16 -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
21644321e4
Merge pull request #14993 from twbs/fix-14991
...
Have Carousel ignore keyboard events from <input>s or <textarea>s
2014-11-04 16:50:36 -08:00
Heinrich Fenkart
da74fba490
Center modal dialog at all times
2014-11-05 01:37:44 +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
Heinrich Fenkart
14e5fb04e9
Fix modal backdrop overlaying the modal's scrollbar
...
Fixes #14916 .
2014-11-04 23:17:55 +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
5178d8b8ba
Use RegExp for button plugin's focus shim
...
Fixes #14923 .
2014-10-30 03:46:49 +01:00
Mark Otto
94b59b57d6
version bump
2014-10-29 08:56:20 -07:00
Ben-Russell
68b771a057
Independently delegate data-api selectors
...
Fixes #14462 .
Closes #14463 by merging it.
2014-10-29 04:54: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
c1f669e83b
Revert "Scrollspy: ignore invisible list items"
2014-10-26 01:50:38 +02:00
Heinrich Fenkart
fe51148434
Merge pull request #14669 from vsn4ik/dropdown_event_target
...
Use e.target instead :focus selector.
2014-10-23 06:13:46 +02:00
Heinrich Fenkart
3c98dd35ba
Fix IE8 unit test breakage introduced by #14767
2014-10-22 22:09:58 +02:00
