0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-11-29 11:24:18 +01:00
Commit Graph

952 Commits

Author SHA1 Message Date
Mark Otto
54df51b5ea Merge pull request #16437 from twbs/fix-16249
Document that nested tabs are not supported
2015-05-14 11:07:05 -07:00
Mark Otto
c5babda02f Merge pull request #16215 from zacechola/list_group_buttons
Adds button styles to `.list-group-item`
2015-05-13 21:35:39 -07:00
Mark Otto
82279a8eb2 Merge branch 'btn-borders' of https://github.com/martinbean/bootstrap into martinbean-btn-borders 2015-05-13 21:20:02 -07:00
XhmikosR
1eba173c9e Update jQuery to v1.11.3. 2015-05-10 01:22:23 +03:00
Chris Rebert
843581b8ff docs examples: input[placeholder]: "Enter email" => "Email"
For uniformity, as we don't seem to use this "Enter <X>" phrasing anywhere else.

[skip sauce]
2015-05-08 00:24:39 -07:00
Julian Thilo
a3c480fd94 Closes #16249: Doc that nested tabs are not supported 2015-05-06 22:37:56 +02:00
Chris Rebert
89f2c5c5c0 Document that $(...).button('reset') is async.
Closes #16362.
[skip sauce]
2015-05-05 15:03:12 -07:00
Chris Rebert
fce30b57e2 Mark stateful button feature as deprecated
Refs https://github.com/twbs/bootstrap/issues/16362#issuecomment-96268469
[skip sauce]
2015-05-05 15:03:05 -07:00
Chris Rebert
a19441dd64 Merge pull request #16409 from twbs/fix-16361
Document Affix plugin's `checkPosition` method
2015-05-04 12:28:41 -07:00
Anthony Barone
1f5519b981 Added #panels-footer to components nav in docs 2015-05-03 20:33:38 -04:00
Chris Rebert
75d6c14dc9 Document that 'manual' is mutually exclusive of other tooltip/popover triggers
Closes #16122
[skip sauce]
2015-05-02 18:24:12 -07:00
Chris Rebert
85235c55ac Document Affix plugin's checkPosition method
Fixes #16361
Refs #16356
[skip sauce]
2015-05-02 13:02:48 -07:00
Patrick H. Lauke
0b937117a4 Remove inappropriate role="button" from download links 2015-04-30 11:08:23 +01:00
Zac Echola
fa2cdd44bc Adds documentation for buttons in link groups
Mostly a duplication of the *Linked items* section, but for buttons.
Includes a note not to use the standard btn classes.
2015-04-28 10:58:42 -05:00
Martin Bean
9a451d4aea Add @btn-border-radius variables (#16271) 2015-04-26 17:42:34 +01:00
Mark Otto
3117c98f13 nav 2015-04-25 13:20:59 -07:00
vsn4ik
d46f6dcbdc DOCS: Separation of .dropdown and .dropup. 2015-04-25 12:52:22 +03:00
Mark Otto
46a3506a42 clarify some docs, improve layout 2015-04-22 23:09:05 -07:00
Adrien Siami
e949505b89 Allow viewport option to be a function
Closes #16151 by merging a rebased version of it that adds docs and 1 more assertion.
2015-04-21 22:20:15 -07:00
Chris Rebert
c6b62f0cd9 Merge pull request #16147 from Johann-S/event_inserted
Fixes #16124.
2015-04-21 21:40:14 -07:00
Mark Otto
325133b33f fix nav 2015-04-18 18:15:19 -07:00
Mark Otto
7e86bfd9ac change nav to use index files for each section; stub out index views for everything 2015-04-18 12:28:50 -07:00
Chris Rebert
a955164a67 Merge pull request #16282 from JoshData/patch-1
affix plugin does not work within a pulled/pushed column
2015-04-17 12:37:41 -07:00
Mark Otto
0ab1576ae2 Merge branch 'v4' of https://github.com/twbs/derpstrap into v4 2015-04-16 18:54:17 -07:00
Mark Otto
605990400e collapsing navbar tools 2015-04-16 18:50:32 -07:00
Mark Otto
c84cf4f7f5 rename classes from .bs-docs and .bs to .bd 2015-04-16 14:07:20 -07:00
Mark Otto
3c93681245 more docs nav changes 2015-04-15 16:07:50 -07:00
Mark Otto
5e0ac61649 footer copy 2015-04-15 15:31:31 -07:00
Chris Rebert
21e94b0374 Update docs to account for #15755 2015-04-14 18:40:36 -07:00
Joshua Tauberer
20b5e24765 affix plugin does not work within a pulled/pushed column
This documents the limitation discussed in https://github.com/twbs/bootstrap/issues/12126:

> When using column reordering and using the affix-plugin on an element positioned with push, the affix plugin doesn't work correctly - the element affected by the affix plugin is positioned to the left even when the element is in a column positioned on the right.

Seems to affect Safari (tested in version 8) only.

That issue has (unfortunately) been closed, so this at least documents the behavior.
2015-04-14 16:37:07 -04:00
Johann-S
3d71eae301 Add event after template inserted 2015-04-08 13:10:53 +02:00
Chris Rebert
4cf748b017 Carousel docs: fix typo in holder.js color 2015-04-07 18:52:59 -07:00
fyquah95
4d153b9125 indented javascript/modal/using-grid-system sample code from 4 spaces to 2 spaces 2015-04-01 17:43:32 +08:00
Mark Otto
ce75f289f2 grunt 2015-03-28 23:33:11 -07:00
Patrick H. Lauke
3b28b75cf3 Remove wrong role="tabpanel" from parent container
As per discussion on https://github.com/w3c/wai-wcag-quickref/issues/2
and #13554
2015-03-27 11:57:03 +00:00
Chris Rebert
caa84299ec Merge pull request #16158 from twbs/fix-16020
remove redundant aria-hidden usage from Modals
2015-03-25 18:40:44 -07:00
Chris Rebert
d6714d1383 Merge pull request #16157 from twbs/fix-16069
Document how to disable transitions in jQuery plugins
2015-03-25 18:14:15 -07:00
Chris Rebert
6c5e7dfce1 rm redundant aria-hidden usage from Modals; fixes #16020 2015-03-25 18:06:47 -07:00
Chris Rebert
e8a5112b31 Document how to disable transitions in jQuery plugins; fixes #16069
[skip sauce]
2015-03-25 17:56:59 -07:00
Chris Rebert
343827081f Properly document $(...).tab('show') method; fixes #16115
[skip sauce]
2015-03-25 17:47:56 -07:00
Chris Rebert
1bafd4c829 docs: #myTab => #myTabs, to slightly increase clarity 2015-03-25 17:39:44 -07:00
Chris Rebert
2f3076f20a add missing <code> within docs heading for .modal('handleUpdate') 2015-03-24 15:15:21 -07:00
Chris Rebert
d37bc2ae65 Merge pull request #15987 from twbs/fix-15972
add role="button" to a[data-toggle="collapse"]
2015-03-24 08:57:56 -07:00
Patrick H. Lauke
04280335f6 Add aria-expanded and aria-controls to docs navbar toggle
Also, use id rather class name for the navigation, as it's unique and
lets us use correct aria-controls (and without the use of id,
aria-expanded does not get updated correctly by the current dropdown
toggle script)
2015-03-24 10:32:53 +00:00
Patrick H. Lauke
dc4aa004d4 Add aria-expanded to navbar toggles 2015-03-24 10:30:12 +00:00
Patrick H. Lauke
6c2548e031 Move all tooltip callouts into appropriate section
Before, most callouts hierarchically came under Examples > Four
directions, which is not appropriate. Now they're under Markup
2015-03-23 22:06:22 +00:00
Patrick H. Lauke
debcb1de59 Callout for tooltips and keyboard/AT accessibility
Include callout explicitly mentioning tooltips should only be added to
focusable elements. Closes #16134
2015-03-23 21:53:30 +00:00
Rodrigo Prado
fbe0836a8f Add docs on how to install Bootstrap via composer
Closes #16113
Closes #16114

[skip sauce]
2015-03-20 18:42:03 -07:00
Chris Rebert
66ceae7b75 Clarify that role="button" is required for dismiss-on-next-click popovers
Refs #15947
2015-03-16 00:57:23 -07:00
Chris Rebert
f3ae9430f2 Document that .progress-bar-striped doesn't work in IE<=9; fixes #16058
[skip sauce]
2015-03-13 13:53:12 -07:00
Mark Otto
6944e418eb docs redesign a bit 2015-03-09 14:07:46 +00:00
Chris Rebert
cc39f5c52d add role="button" to a[data-toggle="collapse"]; fixes #15972 2015-03-03 13:18:36 -08:00
Steven Black
20d3ad10eb Accessibility and headings hierarchy for the "CSS" page.
Closes #15948 by merging it.
2015-03-03 18:29:33 +02:00
Steven Black
0862d1410e Accessibility and headings hierarchy for the "Getting started" page.
Closes #15946 by merging it.
2015-03-03 18:26:38 +02:00
Steven Black
457885075f Javascript docs: Accessibility and cosmetic changes to headings.
Closes #15915 by merging it.
2015-03-03 18:22:09 +02:00
Heinrich Fenkart
be68cdd4b8 Properly document Modal#handleUpdate 2015-03-03 06:45:38 +01:00
Chris Rebert
08e0f23929 Merge pull request #15965 from kkirsche/fixURL
[Docs / README] Fix URL to match the plugin keyword recommendation
2015-03-01 14:32:31 -08:00
Kevin Kirsche
673cd67798 Fix URL to match the keyword
Fix URL to match the keyword
2015-03-01 16:44:13 -05:00
Mark Otto
c16fee5efd Merge branch 'master' into v4
Conflicts:
	.travis.yml
	Gruntfile.js
	bower.json
	dist/css/bootstrap.css
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	dist/js/bootstrap.js
	dist/js/bootstrap.min.js
	docs/_data/glyphicons.yml
	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/labels.html
	docs/_includes/components/list-group.html
	docs/_includes/components/media.html
	docs/_includes/components/navs.html
	docs/_includes/components/panels.html
	docs/_includes/components/progress-bars.html
	docs/_includes/components/thumbnails.html
	docs/_includes/components/wells.html
	docs/_includes/css/buttons.html
	docs/_includes/css/forms.html
	docs/_includes/css/helpers.html
	docs/_includes/css/images.html
	docs/_includes/css/less.html
	docs/_includes/customizer-variables.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/examples.html
	docs/_includes/getting-started/grunt.html
	docs/_includes/getting-started/license.html
	docs/_includes/getting-started/template.html
	docs/_includes/header.html
	docs/_includes/js/affix.html
	docs/_includes/js/alerts.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/popovers.html
	docs/_includes/js/scrollspy.html
	docs/_includes/js/tabs.html
	docs/_includes/js/tooltips.html
	docs/_includes/js/transitions.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/assets/js/vendor/FileSaver.js
	docs/assets/js/vendor/autoprefixer.js
	docs/assets/js/vendor/uglify.min.js
	docs/dist/css/bootstrap.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
	docs/dist/js/bootstrap.min.js
	docs/examples/blog/index.html
	docs/examples/carousel/index.html
	docs/examples/cover/index.html
	docs/examples/dashboard/index.html
	docs/examples/narrow-jumbotron/narrow-jumbotron.css
	docs/examples/navbar-fixed-top/index.html
	docs/examples/navbar-static-top/index.html
	docs/examples/non-responsive/index.html
	docs/examples/non-responsive/non-responsive.css
	docs/examples/theme/index.html
	grunt/configBridge.json
	js/affix.js
	js/carousel.js
	js/collapse.js
	js/dropdown.js
	js/modal.js
	js/popover.js
	js/scrollspy.js
	js/tab.js
	js/tests/unit/affix.js
	js/tests/unit/button.js
	js/tests/unit/carousel.js
	js/tests/unit/modal.js
	js/tests/unit/tooltip.js
	js/tooltip.js
	less/badges.less
	less/glyphicons.less
	less/type.less
	less/variables.less
	package.json
	scss/_dropdown.scss
	scss/_forms.scss
	test-infra/npm-shrinkwrap.json
2015-03-01 13:44:10 -08:00
Kevin Kirsche
7b3e4d8423 Replace accidently removed text
X-Ref #15742

cc: @mdo
2015-03-01 16:24:12 -05:00
Kevin Kirsche
94406bcae0 [Fixes #15928] Encourage use of icons with form validation states for colorblind users
[Fixes #15928] Encourage use of icons with form validation states for colorblind users

Update text per @patrickhlauke's feedback

Update text per @patrickhlauke's feedback.

Fix stupid grammar mistake
2015-02-28 17:07:20 -05:00
Mark Otto
8982de3482 Merge pull request #15914 from StevenBlack/docs.js.headings
docs > js > headings
2015-02-24 21:14:43 -08:00
Heinrich Fenkart
0553300a36 Follow-up to 769c27a19f: Add new section to nav 2015-02-25 03:30:58 +01:00
Kevin Kirsche
769c27a19f Document how to properly handle modals with dynamic content height
Fixes #15106.
Closes #15910.
2015-02-25 03:23:02 +01:00
Steven Black
e9b29a3ef0 Accessibility changes to headings (transitions.html) 2015-02-24 20:19:00 -05:00
Steven Black
daccfc3c0f Accessibility changes to headings (overview.html) 2015-02-24 20:17:14 -05:00
Mark Otto
be164f4d1a Merge pull request #15900 from kkirsche/patch-5
[Docs—Fixes #15882]Use an ID as the example for Scrollspy
2015-02-24 16:30:49 -08:00
Mark Otto
7e594b4b03 Merge pull request #15903 from michael-k/patch-1
Updated license links
2015-02-24 16:28:36 -08:00
Mark Otto
2457b40eab Merge pull request #15887 from StevenBlack/headings-labels
docs>components>labels headings
2015-02-24 16:27:36 -08:00
Mark Otto
7e0b801f4c Merge pull request #15889 from StevenBlack/headings-progressbars
docs>components>progress bars headings
2015-02-24 16:27:24 -08:00
Chris Rebert
a415b91558 Merge pull request #15828 from kkirsche/patch-20
Add plugin package keyword recommendation
2015-02-24 16:26:39 -08:00
Mark Otto
13c690f992 Merge pull request #15891 from StevenBlack/headings-listgroup-panel-well
docs>components>(remaining components) headings
2015-02-24 16:26:17 -08:00
Mark Otto
7872ca69be Merge pull request #15890 from StevenBlack/headings-media
docs>components>media object headings
2015-02-24 16:25:59 -08:00
Mark Otto
3c4a8ea61b Merge pull request #15888 from StevenBlack/headings-thumbnails
docs>components>thumbnails headings
2015-02-24 16:24:49 -08:00
Mark Otto
0e12bb4947 Merge pull request #15886 from StevenBlack/headings-buttondropdowns
docs>components>button-dropdowns headings
2015-02-24 16:23:17 -08:00
Mark Otto
05d0e88dbb Merge pull request #15885 from StevenBlack/headings-buttongroups
docs>components>button-groups headings
2015-02-24 16:22:52 -08:00
Mark Otto
212c114bb6 Merge pull request #15884 from StevenBlack/headings-dropdowns
docs>components>dropdowns.html headings
2015-02-24 16:22:24 -08:00
Michael
3425489273 Updated license links
Added attributes rel and target.
2015-02-24 20:03:28 +01:00
Kevin Kirsche
ced312a90e [Docs—Fixes #15882]Use an ID as the example for Scrollspy
Fixes #15882 — Use an ID as the example for Scrollspy so that it is more clear that this is for use with a single nav.
2015-02-24 09:14:50 -05:00
Christian
1ec651b3cd Update footer.html
Update Creative Commons link to HTTPS.
2015-02-24 22:47:03 +09:00
Steven Black
79eb5854ea docs>components>(remainder) headings 2015-02-23 22:14:50 -05:00
Steven Black
74b4f83434 docs>components>media object headings 2015-02-23 21:59:27 -05:00
Steven Black
8a64c684de docs>components>progress bars headings 2015-02-23 21:51:10 -05:00
Steven Black
f8280e40a0 docs>components>thumbnails headings 2015-02-23 21:41:53 -05:00
Steven Black
3e2dee6bd5 Normalized the heading hierarchy in the documentation for the Labels component. 2015-02-23 21:35:37 -05:00
Steven Black
106445aea8 Normalized the heading hierarchy in the documentation for the Button dropdowns component. 2015-02-23 21:23:50 -05:00
Steven Black
9159e44a7a docs>components>button-groups headings
Normalized the heading hierarchy in the documentation for the Button groups component.
2015-02-23 21:16:02 -05:00
Steven Black
36fdaa8030 Docs>Components>Dropdowns headings
Normalized the heading hierarchy in the documentation for the Dropdowns component.
2015-02-23 21:01:54 -05:00
Kevin Kirsche
114d1cf76c Add plugin package keyword recommendation
Related to #15823, I would be interested in officially recommending a keyword such as `twbs-bootstrap` so that we can more easily showcase plugins and extensions for Bootstrap without requiring additional curation by the admins / collabs of TWBS

specificity

Add additional comment to docs

Fix capitalization

Update tag per @mdo's recommendation
2015-02-23 13:53:01 -05:00
Patrick H. Lauke
36d6af9bcd Fix copy/pasta'd id on accessibility skiplink callout 2015-02-21 15:02:40 +00:00
Patrick H. Lauke
b9504feb80 Typo in URL 2015-02-21 14:00:04 +00:00
Quy Ton
074419298e Fix capitalization/singular of comments in helper class docs
Closes #15839 by merging a tweaked version of it.
2015-02-20 20:02:20 -08:00
Jon Chretien
7080e895d8 fixed a few typos in the docs 2015-02-20 17:07:14 -05:00
Kevin Kirsche
504435e0b0 Fix #15712: Add example of how to use grid system within a modal
Closes #15725 by merging a tweaked version of it.
2015-02-19 16:14:06 -08:00
Chris Rebert
e9afc74b01 Dropdown docs: Tweak .dropup copy 2015-02-19 16:01:04 -08:00
Chris Rebert
89455afe97 Affix docs: add MDN link for position: sticky 2015-02-19 15:55:33 -08:00
Chris Rebert
3748e44b2e Merge pull request #15773 from kkirsche/patch-16
Fix #15766: Clarify Affix plugin docs
2015-02-19 15:53:49 -08:00
Kevin Kirsche
744c3646f5 [Fixes #15766] Need Clearer Affix plugin documentation
[Fixes #15766] Need Clearer Affix plugin documentation

Remove trailing whitespace

Update the documentation
2015-02-19 16:38:03 -05:00
Chris Rebert
0b10c6b060 Merge pull request #15662 from kkirsche/patch-5
Fix issue #15597 — Mention dropup variation in dropdown docs
2015-02-19 11:29:24 -08:00
Mark Otto
a7a6e7f8d6 Merge pull request #15703 from kkirsche/patch-9
[Fix Issue #15683] `readonly` input should not have a not-allowed cursor
2015-02-17 11:31:36 -08:00
vsn4ik
1bb3ef3e0b Use https://www.npmjs.com (new site). 2015-02-17 10:01:58 +03:00
Chris Rebert
763f8293da .text-hide docs: trivial indentation fix 2015-02-12 10:41:16 -08:00
Chris Rebert
0fe6ff9fca browser-device-support.html: tweak indentation 2015-02-12 10:40:00 -08:00
Chris Rebert
19a6406ec4 fix indentation of highlighted code in Modal docs 2015-02-12 10:36:15 -08:00
Kevin Kirsche
d78d9dc5d9 Remove separate area for dropup's
Condense the dropup example
2015-02-10 08:57:56 -05:00
XhmikosR
81115cd089 Run grunt. 2015-02-10 10:50:57 +02:00
Kevin Kirsche
894ec6f714 Fixes #15653 — Add comment which explains that how a responsive image should be centered
Fixes #15653 — Add comment which explains that how a responsive image should be centered

Redo of #15657 which I couldn't get to rebase properly after all the merges were done last night.
2015-02-09 13:55:37 -05:00
Mark Otto
2fad6e8dd2 Merge pull request #15648 from Nikita240/master
Improve image layout in the carousel example.
2015-02-08 17:25:13 -08:00
Chris Rebert
e7de01eeed Update Twitter handle: @twbootstrap => @getbootstrap
Refs 1c94b7791f
CC: @mdo
2015-02-06 11:54:07 -08:00
Patrick H. Lauke
27677fab5b Merge pull request #15714 from patrickhlauke/skip-link-fixes
Skip link workarounds for Chrome and IE
2015-02-04 15:38:17 +00:00
Kevin Kirsche
be2206edfc [Fix Issue #15701] Tooltip/popover destroy docs don't explain the delegation case
[Fix Issue #15701] Tooltip/popover destroy docs don't explain the delegation case.

Add to popovers
2015-02-03 15:49:03 -05:00
Chris Rebert
012af29efc Merge pull request #15740 from twbs/carousel-events-target
Clarify target of carousel events
2015-02-03 10:58:33 -08:00
Chris Rebert
ab99374a9c Clarify target of carousel events
[skip sauce]
2015-02-03 10:53:33 -08:00
Chris Rebert
89ef0a5d34 Clarify target of modal events 2015-02-03 10:48:56 -08:00
Kevin Kirsche
2dfc58fa5c [Fix Issue #15683] readonly input should not have a not-allowed cursor
[Fix Issue #15683] `readonly` input should not have a `not-allowed` cursor. Instead, this pull request displays a standard cursor and only displays the not-allowed cursor on disabled items.

Revise docs wording to clarify cursor display
2015-02-03 08:58:11 -05:00
XhmikosR
391054fa2d Merge pull request #15658 from kkirsche/patch-3
Fix issue #15601 — Position of Charset, X-UA-Compatible, and Viewport Meta Tags
2015-02-03 07:22:45 +02:00
Kevin Kirsche
a380e30f7e Fix issue #15601 — Position of X-UA-Compatible
Fix issue #15601 — Position of X-UA-Compatible, charset and viewport

Add comment to all examples

The non-responsive is correctly saying 2 instead of 3
2015-02-02 15:45:57 -05:00
Patrick H. Lauke
214516da16 Expand/clean-up prose about skip links 2015-02-02 12:30:21 +00:00
Patrick H. Lauke
c0892d1470 Skip link workarounds for Chrome and IE
Add tabindex="-1" to main #content to work around bug in Chrome (and old
WebKits) and IE
Update advice in accessibility section
Include patch in docs CSS to suppress outline when #content is focused
(particularly as Chrome sets focus as result of mouse click for
tabindex="-1" elements)
2015-01-31 13:09:57 +00:00
Patrick H. Lauke
4d4c7c4051 License FAQ clarification 2015-01-30 16:03:07 +00:00
Chris Rebert
97e5ac1c92 Fix #15688
Stability > Precision
2015-01-29 18:00:49 -08:00
Kevin Kirsche
98d4464065 Update per @vsn4ik's requests
data-example-id not need be moved. Only change, because data-example-id="static-dropdown" already exists.

Remove whitespace after h3.
Variation not need capitalize.
2015-01-28 13:47:02 -05:00
Kevin Kirsche
5688fc8d65 Complete @vsn4ik's requests
* Remove `<h3>Example</h3>;`
* Move `data-example-id=""` to `<h3>Dropup Variation</h3>` and change value;
2015-01-27 17:01:59 -05:00
XhmikosR
9f25895015 Fix validation errors.
Surprisingly those weren't reported by the validator; only in the grunt-contrib-htmlmin branch they were reported, so after digging into it, I saw they were indeed errors...
2015-01-26 17:58:09 +02:00
Kevin Kirsche
dc50153c93 Fix issue #15597 — Mention dropup variation in dropdown docs
Fix issue #15597 — Mention dropup variation in dropdown docs

Other pull request was so messed up I sincerely have no clue how to save it. The recommended command doesn't work, can't believe rebasing is so problematic...
2015-01-23 21:48:33 -05:00
Nikita Rushmanov
6e782ed42d Add a warning in images.html about text-align
People normally center images using text-align. However, the `.img-responsive`
class changes the display type to block. As a result you can no longer align the 
image with text-align. You must instead do it with margin: auto. There was no 
note about this on the web page, and no mention about setting the display to
block. Users were left on a frustrating journey to figure out why they can't center
images anymore!
2015-01-23 03:16:07 -08:00
Mark Otto
efd7792488 Merge branch 'master' of github.com:twbs/bootstrap 2015-01-21 21:06:28 -08:00
Mark Otto
a3890a72cf Merge branch 'master' into move-inline-css
Conflicts:
	docs/assets/css/docs.min.css
2015-01-21 20:16:08 -08:00
Mark Otto
8ec708870c Merge pull request #15299 from SpectrumPixel/patch-2
Remove "Separated link" in example where it's not
2015-01-21 19:58:03 -08:00
Mark Otto
af9c7151b3 Merge branch 'docs-anchors' 2015-01-21 19:20:21 -08:00
XhmikosR
a6f3bdb71f Move inline CSS to docs.css. 2015-01-21 09:51:12 +02:00
XhmikosR
3f512c927b Add AnchorJS for docs anchors. 2015-01-21 09:50:51 +02:00
Mark Otto
9e0c4ff786 several docs cleanup things 2015-01-20 22:57:24 -08:00
Mark Otto
74fbf61e30 custom holder theme 2015-01-20 21:12:25 -08:00
Chris Rebert
2e20e67dc1 Document sticky :hover on mobile browsers; fixes #12832 2015-01-20 19:22:20 -08:00
Mark Otto
ff1d10affb fix scrollspy nav 2015-01-19 18:51:21 -08:00
Mark Otto
72bc9b97f0 fix homepage nav styles 2015-01-19 15:44:45 -08:00
Mark Otto
a72741ed62 nuke files 2015-01-19 15:25:53 -08:00
Mark Otto
d8c94029d3 move around files 2015-01-19 15:25:49 -08:00
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
4ed95f5fa2 fixes #15497: increase decimals on line-height-large from 1.33 to 1.3333333 to fix button sizing in Win 8.1 Chrome 2015-01-18 15:03:14 -08:00
Chris Rebert
161eac4fd7 rm dummy href from dismiss-on-next-click popover example; fixes #15277 2015-01-18 12:51:47 -08:00
Chris Rebert
2eaa7e0e1c Merge pull request #15581 from twbs/inline-form-with-visible-labels
Add example of using .form-inline with visible <label>s
2015-01-16 08:20:41 -08:00
Dan Course
21f7254e10 12 items of *fewer* as it's a countable item
http://www.oxforddictionaries.com/words/less-or-fewer
2015-01-16 10:36:46 +00:00
Chris Rebert
ca2c1e1576 custom widths not always required for inline form fields
[skip sauce]
2015-01-15 17:52:02 -08:00
Chris Rebert
2fa70f37da Add example of using .form-inline with visible <label>s
Refs #15410
[skip sauce]
2015-01-15 17:47:22 -08:00
Chris Rebert
63f3136450 Document that tooltip+popover show+hide methods are async; fixes #15500
[skip sauce]
2015-01-15 17:18:00 -08:00
Chris Rebert
499f71d27f Merge pull request #15498 from twbs/fix-15332
Add examples of using feedback icons with .input-group
2015-01-15 15:49:46 -08:00
Chris Rebert
f1cb639c34 Docs: add missing "http://" 2015-01-15 10:46:58 -08:00
Chris Rebert
47ec330473 Merge pull request #15560 from twbs/fix-15555
Document that .form-inline & .form-horizontal work fine on non-<form>s too
2015-01-14 21:07:26 -08:00