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

157 Commits

Author SHA1 Message Date
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
88ec5152da clarify collapse example with link and button triggers; also mention classes 2014-11-30 17:10:13 -08:00
Mark Otto
9928144dc4 Fixes #15241: Add simple example to docs for collapse plugin 2014-11-29 23:03:47 -08:00
XhmikosR
0c816d910d Merge pull request #15159 from twbs/docs-muted
Clean up old `muted` references and switch to `text-muted`.
2014-11-20 10:27:42 +02:00
Chris Rebert
af77842ce7 Merge pull request #15111 from twbs/events-tables-wrapping
Don't line wrap event names in JS plugin docs
2014-11-20 00:06:33 -08:00
XhmikosR
a1b8aa351e Clean up old muted references and switch to text-muted. 2014-11-20 08:02:25 +02:00
Chris Rebert
8bb59abf40 Merge pull request #15090 from twbs/dropdowns-events
consolidate relatedTarget docs in dropdown event docs
2014-11-19 17:33:17 -08:00
Chris Rebert
450a9ece10 Merge pull request #15125 from patrickhlauke/docs-clean-up
Docs clean up - unnecessary role attributes, callout clarifications
2014-11-17 02:13:21 -08:00
Chris Rebert
7876ebd2ed rm redundant role="button" from <button> 2014-11-16 16:34:28 -08:00
hillai
0ada807ce6 Add modal autofocus example 2014-11-16 16:48:08 +02:00
Patrick H. Lauke
bab36220c9 Redundant role="navigation" on <nav>s
plus one example that still used the old <div role="navigation"> and a
fix-up of the callout as per
https://github.com/twbs/bootstrap/issues/15109
2014-11-14 10:52:57 +00:00
Patrick H. Lauke
25cac1ea9a Redundant role="form" on <form>s 2014-11-14 10:52:56 +00:00
Chris Rebert
ea407666ce give all docs callouts IDs
[skip sauce]
2014-11-13 12:16:03 -08:00
Chris Rebert
ddf39cc2e7 Don't line wrap event names in JS plugin docs 2014-11-12 16:32:51 -08:00
Chris Rebert
856d31b373 Merge pull request #15089 from twbs/data-attrib-callout
move data attributes callout into data attributes doc subsection
2014-11-12 10:07:22 -08:00
Chris Rebert
1211a8155e JS docs: add Options, Methods, Events subsections to nav sidebar 2014-11-11 21:16:34 -08:00
Chris Rebert
c672ed3fb0 Merge pull request #15092 from twbs/scrollspy-callouts
move scrollspy callouts so they're all adjacent to each other
[skip sauce]
2014-11-11 19:56:28 -08:00
Chris Rebert
69d42cef14 move scrollspy callouts so they're all adjacent to each other 2014-11-11 19:42:29 -08:00
Chris Rebert
e2e9613f83 move popover examples heading to directly before the actual examples 2014-11-11 19:40:47 -08:00
Chris Rebert
d79e898d67 consolidate relatedTarget docs in dropdown event docs 2014-11-11 19:38:06 -08:00
Chris Rebert
ab1a9d4fac move data attributes callout into data attributes doc subsection 2014-11-11 19:35:08 -08:00
Chris Rebert
5ba5200195 move carousel accessibility callout next to rest of callouts 2014-11-11 19:29:56 -08:00
Chris Rebert
3b2d1570fa move single-toggle button plugin callout before example for consistency 2014-11-11 19:26:10 -08:00
Heinrich Fenkart
56f4156126 Merge pull request #15087 from patrickhlauke/dropdown-accessibility-tweaks
Wash-up of some stray dropdown examples
2014-11-12 01:19:39 +01:00
Patrick H. Lauke
0681971c8a Wash-up of some stray dropdown examples
adding explicit aria-expanded="false" initial state (so they're
correctly announced by AT as being collapsed), and - in the case of
old-school use of <a> - role="button"
2014-11-11 23:52:52 +00:00
Mark Otto
2006a435d9 Merge pull request #15077 from jayanthkoushik/issue-15076-fix
Fix Issue #15076.
2014-11-11 15:47:01 -08:00
Patrick H. Lauke
9391ef207f aria-hidden added to some stray glyphicons
plus minor tweak to customizer's generated alerts
2014-11-11 22:41:21 +00:00
Jayanth Koushik
917decab6c Fix Issue #15076.
This commit adds documentation explaining the need to have an initial
.active element in carousels.
2014-11-11 15:28:21 +05:30
Patrick H. Lauke
bb89657bcb Assorted accessibility (and some consistency) fixes for documentation
Closes #14951 by merging it.
2014-11-11 07:46:14 +01: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
Jayanth Koushik
e55feacf5b Add initialization examples to tooltip and popover "Opt-in functionality" callouts
Fixes #14950.
Closes #15015 by merging it.
2014-11-04 20:00:08 +01:00
Chris Rebert
594831f4f3 Add event.relatedTarget + data-* example to Modal docs
Fixes #14245
2014-11-03 13:37:27 -08:00
Aaron Cordovez
f412979287 Fix typo
Corrected spelling of the word "elements"
2014-11-01 17:46:33 -07:00
Manuel Meurer
1f64aac6b9 fix whitespace in js dropdown docs 2014-11-01 11:51:11 +01:00
hillai
1339ab7a13 Replace v3.2.1 reference with v3.3.0 since there wasn't a v3.2.1
Closes #14941
2014-10-30 10:20:54 -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
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
Chris Rebert
57e4b58782 Merge pull request #14859 from twbs/fix-14853
Clarify order of tabs events
2014-10-22 18:57:43 -07:00
Chris Rebert
b421dc9490 Clarify order of tabs events; fixes #14853
[skip sauce]
2014-10-22 18:38:18 -07:00
Chris Rebert
8d806b0ae5 Document .alert-dismissible .close restrictions; fixes #14802
[skip sauce]
2014-10-22 18:05:42 -07:00
Phil Hughes
ab8dbc214e Implement hide and hidden events for tabs
Closes #14772.
2014-10-22 21:42:35 +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
Chris Rebert
f26dde085f add role="button" to a couple more dummy-anchor btns 2014-10-20 20:16:09 -07:00
XhmikosR
909a178362 Change Twitter links to use https. 2014-10-07 15:28:41 +03:00
Jacob
2c562d2386 Merge pull request #14590 from twbs/carousel-keyboard-option
Add `keyboard` option to carousel
2014-10-02 23:11:14 -07:00
Mark Otto
76268c4b96 more grunt 2014-10-02 21:21:49 -07:00
Mark Otto
12091b9567 Fixes #14711: Account for list groups in collapsing panels 2014-10-02 21:19:20 -07: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
David Nguyen
6fa7495333 Fix #12563: Reiterate that empty tooltips+popovers do not get displayed 2014-10-02 10:44:20 -07:00
Nicole Bartelt
7398e1904b Added default collapsed class to the collapsed accordion html code example in the docs 2014-09-30 17:54:34 -07:00