0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-13 01:08:58 +01:00
Commit Graph

649 Commits

Author SHA1 Message Date
Mark Otto
75943868be update home and side nav to use new navbar structure 2014-12-01 15:41:11 -08: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
0eb2c922d8 Merge branch 'master' of github.com:twbs/bootstrap 2014-11-30 17:11:24 -08:00
Mark Otto
88ec5152da clarify collapse example with link and button triggers; also mention classes 2014-11-30 17:10:13 -08:00
Quy Ton
a6950ce276 Add .media-object in docs 2014-11-30 07:44:14 -08:00
Mark Otto
65f72ff095 Merge pull request #15133 from patrickhlauke/docs-table-fixes
Fixes to scope
2014-11-29 23:17:36 -08:00
Mark Otto
9928144dc4 Fixes #15241: Add simple example to docs for collapse plugin 2014-11-29 23:03:47 -08:00
Mark Otto
1de638f830 fixes #15164: wrap disable pagination spans in another span 2014-11-29 18:27:51 -08:00
Mark Otto
c9289691ba fix the run-on 2014-11-29 16:53:37 -08:00
Peter Blazejewicz
c1885ef58b Add CSS source maps reference to docs. Closes #15211
- update distribution file list with relevant files
- add a short reference to CSS source map purpose
- add link to Google Chrome developer network article
2014-11-27 22:03:32 +01:00
Julian Thilo
c022d88ac5 Merge pull request #15108 from zacechola/irc_room
corrects IRC room
2014-11-24 15:46:14 +01:00
Julian Thilo
7bf002d63d Fix #15194: Shrink media link area 2014-11-22 13:45:32 +01: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
Quy Ton
347ad61010 Fix name spelling 2014-11-17 08:05:26 -08:00
Chris Rebert
03f35d2dab Since Safari has released new fixed versions, we're unlikely to take any further action on this. 2014-11-17 03:19:05 -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
XhmikosR
d782eed426 Merge pull request #15129 from twbs/examples-img-alt
Specify `img` alternative text.
2014-11-17 11:31:21 +02:00
Chris Rebert
7876ebd2ed rm redundant role="button" from <button> 2014-11-16 16:34:28 -08:00
XhmikosR
1a2baf4873 Merge pull request #15139 from patrickhlauke/docs-button-section-restructure
Docs button section restructure
2014-11-16 17:42:33 +02:00
XhmikosR
5245bafb92 Merge pull request #15135 from hillai/patch-1
Add modal autofocus example
2014-11-16 17:42:05 +02:00
hillai
0ada807ce6 Add modal autofocus example 2014-11-16 16:48:08 +02:00
Patrick H. Lauke
cb8581580c Move button-tags section to start of button section 2014-11-15 00:26:22 +00:00
Patrick H. Lauke
25ef6ad625 Move context-specific callout to general tag usage 2014-11-15 00:25:13 +00:00
Chris Rebert
729a115c88 split .form-inline .input-group into separate docs example 2014-11-14 12:03:54 -08:00
Patrick H. Lauke
db4e5efb8f Fixes to scope
as discssued in
https://github.com/twbs/bootstrap/issues/15117#issuecomment-63029993

- added ``scope="row"`` to row headers
- made sure row headers are actual ``<th>`` elements
- removed ``scope="col"`` where it was redundant
- simplified table examples with (to me) unnecessary
``rowspan``/``colspan`` (unless you really want complex tables, in which
case we would need full-on ``id`` and ``headers`` attributes to make
sure each table cell has an explicit association with the related header
cells - overkill, in my opinion)
- one table (in typography) left header-less, as it's more or less presentational (though its structure is still important, hence not adding ``role="presentation"``)
2014-11-14 13:40:09 +00: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
Patrick H. Lauke
27d9d35ffd Expand caveat for disabled fieldsets and links 2014-11-14 10:52:56 +00:00
XhmikosR
4d2fb67050 Specify img alternative text. 2014-11-14 11:28:17 +02:00
Quy Ton
cd03436379 Fix link 2014-11-13 22:20:30 -08:00
Chris Rebert
7bdc307b70 clarify that Bower is one among several installation methods 2014-11-13 15:18:55 -08:00
Chris Rebert
3a96a80a1b Merge pull request #15093 from twbs/id-callouts
Give all docs callouts IDs
[skip sauce]
2014-11-13 12:24:03 -08:00
XhmikosR
6ce4ca75a2 Fix a small grammar mistake.
[ci skip]
2014-11-13 22:18:02 +02:00
Chris Rebert
ea407666ce give all docs callouts IDs
[skip sauce]
2014-11-13 12:16:03 -08:00
XhmikosR
5660be42fa Use a 40x40 image for the navbar brand image example.
Saves 3.4KB.
2014-11-13 22:09:38 +02:00
Chris Rebert
e5c888f4a2 Fix .form-inline docs example
Make sample code match live example
Move <label> out of .input-group into .form-group instead
Change field from Email to Username to make it less redundant, slightly more realistic
Add <label> for Username field for consistency
Fixes #15118
2014-11-13 11:32:33 -08:00
Zac Echola
bf43c9cf9f escaped uri 2014-11-13 09:12:31 -06:00
Chris Rebert
ddf39cc2e7 Don't line wrap event names in JS plugin docs 2014-11-12 16:32:51 -08:00
Chris Rebert
82eaefcd43 add link to MDN docs regarding iOS Safari element clickability 2014-11-12 16:16:10 -08:00
Zac Echola
75dfed7f8f corrects IRC room 2014-11-12 15:31:36 -06: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
84dcd226df Merge pull request #15094 from twbs/js-navs
JS docs: add Options, Methods, Events subsections to nav sidebar
2014-11-12 10:06:07 -08:00
Chris Rebert
b87370c28f navbar callouts cleanup
Move all callouts to be adjacent to each other
Combine JS-related callouts into a single callout
2014-11-11 21:22:30 -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
cb9531f378 Merge pull request #15091 from twbs/popovers-heading
move popover examples heading to directly before the actual examples
2014-11-11 19:53:49 -08:00
Chris Rebert
125945eb90 add missing dots to .sr-only class mentions, for consistency w/ rest of docs 2014-11-11 19:51:10 -08:00