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

693 Commits

Author SHA1 Message Date
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
df38cdad32 Merge pull request #15472 from twbs/address-15288
Document that responsive tables use `overflow-y: hidden`
2014-12-31 16:12:38 -08:00
Chris Rebert
c328b6254f Merge pull request #15473 from twbs/autoprefixer-docs
Document that Autoprefixer is required
2014-12-31 16:11:42 -08:00
Mark Otto
1a932b7e02 Merge branch 'v4' of https://github.com/twbs/derpstrap into v4 2014-12-31 10:39:56 -08:00
Nate Eagleson
1b375420fa Remove extra word from disabling-responsiveness.html 2014-12-30 21:48:34 -05:00
Chris Rebert
4f1000d772 Document that Autoprefixer is required
Closes #14937
[skip sauce]
2014-12-30 18:34:48 -08:00
Chris Rebert
511f37dc04 Document that responsive tables use overflow-y: hidden
Closes #15288

[skip sauce]
2014-12-30 18:17:09 -08:00
Chris Rebert
5ccfd98c31 Document the VERSION property of the jQuery plugins; fixes #15202
[skip sauce]
2014-12-30 13:32:28 -08:00
Chris Rebert
c6ad3a8d6d update docs to use .{tooltip,popover}-{left,right,top,bottom} 2014-12-29 12:33:06 -08:00
Chris Rebert
6a5bc63649 rename .arrow => .popover-arrow 2014-12-29 12:33:06 -08:00
Mark Otto
489f2bc1fa no results in search form accounted for 2014-12-25 22:40:25 -08:00
Mark Otto
18e08e777b add custom forms, stub out examples for radios and checkboxes 2014-12-24 04:13:23 -08:00
Mark Otto
73e59c26e6 basic docs search 2014-12-24 02:44:38 -08:00
Mark Otto
0972c64e7a fix sidenav links 2014-12-23 13:23:03 -08:00
Chris Rebert
3406a5c97a Remove holder.js references from syntax-highlighted example HTML
Our use of Holder.js in the docs is a mere implementation detail.
Don't want to confuse people into thinking Holder.js
is somehow required by the Thumbnail component.

[skip sauce]
2014-12-22 14:55:41 -08:00
Mark Otto
36a99c68bf restore configbridge to footer files, update paths 2014-12-19 00:35:54 -08:00
Mark Otto
d1a766494e fix paths and baseurl action 2014-12-19 00:24:09 -08:00
Chris Rebert
f24a1cb28d remove remaining remnants of the Customizer 2014-12-17 13:44:52 -08:00
Mark Otto
4945e370f0 fixes #15340: mention in docs that most selects can't change border-radius 2014-12-14 16:59:47 -08:00
Mark Otto
b7be72c86c Merge pull request #15348 from bastienmoulia/master
Correction in the documentation, add the brand-primary true color in comment and woff2 glyphicons
2014-12-14 16:28:53 -08:00
Patrick H. Lauke
2d41894ce5 Expand/clarify advice about skip links 2014-12-14 21:27:58 +00:00
Julian Thilo
a940e1fdd6 Revert "fix typo in carousel doc" 2014-12-12 14:24:50 +01:00
Bastien
c8855a7ad1 Add glyphicons fonts in woff2 2014-12-12 14:22:41 +01:00
Emmanuel Gautier
f0be5e0409 fix typo 2014-12-12 12:53:50 +01:00
Bastien
bc36e31280 Add new brand-primary color in the doc and the true color in comment 2014-12-12 11:07:16 +01:00
Bastien
5b8ba0cb4d 200 to 260 glyphicons in the doc 2014-12-12 10:58:21 +01:00
XhmikosR
4e27c48248 Run grunt. 2014-12-11 08:24:31 +02:00
Mark Otto
95da2a9428 nuke the customizer 2014-12-10 13:51:43 -08:00
Patrick H. Lauke
d9c3e5f3ad Fix/merge advice on low percentage progress bars
- actually add the ``min-width`` extra style (and use ``em`` rather than
``px``) to the 0% and 2% example
- remove the unnecessarily redundant sentence in the "With labels"
section
- remove the unnecessary heading/section specifically for low percentage
case, make it flow naturally as part of the "With labels" section
2014-12-10 16:50:21 +00:00
Patrick H. Lauke
285ec70493 Make main segmented button keyboard-focusable
unless there's a reason why ``tabindex="-1"`` was dropped in there...
2014-12-08 22:29:34 +00:00
Patrick H. Lauke
24bc102664 Use aria-label for pagination prev/next
Cleaner alternative to using ``<span class="sr-only">``
2014-12-08 22:29:33 +00:00
Patrick H. Lauke
eee275762f Callout for labelling of input groups
plus a few suggested approaches (in some cases, elided, as the actual
content of the label - being a generic example - is not important)
2014-12-08 22:29:33 +00:00
Patrick H. Lauke
c918127e68 Split out/clarify `<select> and multiple` 2014-12-08 12:05:42 +00:00
Patrick H. Lauke
52e4b87b5a Expand advice for optional icons with hidden labels
to clarify/hint that a ``<label class="sr-only">`` is not the only way
to do it
2014-12-08 10:36:26 +00:00
Bas Bosman
e9dca8df52 Add missing to 2014-12-08 09:41:44 +01:00
Mark Otto
e11c634be9 fixes #15311: mention in docs requirement for .btn-group-* sizing on immediate .btn-group 2014-12-07 22:26:19 -08:00
Patrick H. Lauke
202f1f8d69 `<abbr>` with title also useful for AT
...and remove the redundant paragraph for basic abbreviation, which
simply repeats what was just said above.
2014-12-07 20:56:38 +00:00
Patrick H. Lauke
353d8395ae Expand advice about adding labels
Harmonizing this with same advice given for CSS inline forms
2014-12-07 20:56:37 +00:00
Patrick H. Lauke
c609272ac1 `aria-label="close" instead of sr-only span`
shorter, neater, well supported
2014-12-07 14:29:03 +00:00
Chris Rebert
08f388679b tweak grid docs copy
[skip sauce]
2014-12-06 13:55:31 -08:00
Chris Rebert
7e758f60fc Repeat warning comment about keeping "What's included" sections in sync
Refs #15238
[skip sauce]
2014-12-05 11:50:55 -08:00
Chris Rebert
0c5a5563b2 Merge pull request #15214 from twbs/example-ids
Give all embedded live docs examples data-example-id attrs
[skip sauce]
2014-12-04 19:18:29 -08:00
Mark Otto
75943868be update home and side nav to use new navbar structure 2014-12-01 15:41:11 -08:00
Mark Otto
a17f23c022 nuke the other incomplete example per @ianw 2014-12-01 01:39:31 -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