rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-01 13:24:25 +01:00
Code Issues Actions Packages Releases Activity
11,272 Commits 108 Branches 89 Tags 547 MiB
9a451d4aea
Commit Graph

5034 Commits

Author SHA1 Message Date
Kevin Kirsche
7b3e4d8423 Replace accidently removed text 
X-Ref #15742

cc: @mdo
 2015-03-01 16:24:12 -05:00
Patrick H. Lauke
3173efd9d9 Merge pull request #15929 from kkirsche/patch-5 
[Fixes #15928] Encourage use of icons with form validation states for co...
 2015-02-28 22:11:30 +00: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
XhmikosR
05b444aee3 Run grunt. 2015-02-26 11:30:23 +02:00
TJ
10c8dad848 Prevent collapsed navbar in Non-responsive Example 
Closes #15291 by merging it.
 2015-02-25 22:53:21 -08:00
Mark Otto
dd1a31a7de Merge pull request #15916 from kkirsche/patch-2 
Add source code documentation of justified navbar for #15906
 2015-02-24 21:16:55 -08:00
Mark Otto
8982de3482 Merge pull request #15914 from StevenBlack/docs.js.headings 
docs > js > headings
 2015-02-24 21:14:43 -08:00
Kevin Kirsche
3ed961e4c1 Document justified navbar for #15906 
Document in the source code that the justified nav is meant for single line list items only. This should help prevent Issues like #15906 in the future.
 2015-02-24 23:04:59 -05: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
b7b69cd353 Merge branch 'master' of github.com:twbs/bootstrap 2015-02-24 16:43:22 -08:00
Mark Otto
05513c52c4 Fix #15911: Clear the floats and move the padding to the header 2015-02-24 16:43:07 -08: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
XhmikosR
e6dbaea97e Run grunt. 2015-02-20 11:35:45 +02: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
9596a51f54 Add Wall of Browser Bugs entries for #15832 
[skip sauce]
 2015-02-19 12:53:00 -08: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
a2c7233ac0 Use just holder.js instead of docs.min.js in examples when possible 
And add explanatory comments to the Carousel & Dashboard examples regarding holder.js

[skip sauce]
 2015-02-16 19:17:01 -08:00
Chris Rebert
d13e879042 Remove docs.min.js from Blog & Cover examples since it's unnecessary. 2015-02-16 11:40:42 +02:00
XhmikosR
7a4fadb7b8 Fix carousel example images after c08bf4ba8b. 
The revert was incomplete.
 2015-02-16 11:39:14 +02: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
Chris Rebert
5f5b148e49 Fix oneskyapp translation links 
Closes #15754
[skip sauce]
 2015-02-11 16:25:51 -08:00
Gianfranco Palumbo
5af5d6fa7b Fix link to French translation 2015-02-11 00:23:54 +00: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
XhmikosR
33d8fde67c Merge pull request #15708 from twbs/customizer-libs 
Update customizer libs
 2015-02-02 03:52:19 +02: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
XhmikosR
f674f8786b Run grunt. 2015-01-30 15:26:31 +02:00
XhmikosR
2139f01a76 Update uglify.js to v2.4.16. 2015-01-30 15:25:55 +02:00
XhmikosR
8e18eb8c18 Update autoprefixer to v5.1.0. 2015-01-30 15:24:39 +02:00
XhmikosR
c918289b46 Bump FileSaver.js to v2015-01-04. 2015-01-30 15:22:56 +02:00
XhmikosR
8fd5718e71 Run grunt. 2015-01-30 15:13:24 +02: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
Christian
37fbe1cf62 Update non-responsive.css 
Fix typo on Utilize
 2015-01-27 20:51:55 +09: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
Nikita Rushmanov
d41f114e9b Fix image order in carousel example 
When the screen is shrunk below the md threshold, all the featurette columns stack.
However, since the second featurette is "backwards", when stacked the second featurette
looked awkward as the image came before the heading.
 2015-01-23 02:14:12 -08:00
Nikita Rushmanov
ca0fb736c7 Center images in carousel example 
In order to see the changes, you must shrink the browser to below the md threshold.
 2015-01-23 02:02:21 -08:00
Mark Otto
efd7792488 Merge branch 'master' of github.com:twbs/bootstrap 2015-01-21 21:06:28 -08:00
Mark Otto
c08bf4ba8b keep the base64 2015-01-21 21:06:11 -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
Mark Otto
84e41378e6 style changes 2015-01-21 19:20:16 -08:00
Chris Rebert
22a4d96e9a Merge pull request #15620 from twbs/iso-4217 
Add .glyphicon-* aliases for other ISO 4217-ish currency codes
 2015-01-21 13:16:57 -08:00
XhmikosR
53d2abff92 Carousel example: move the Base64 images outside of the HTML. 
Use a simple blank.gif and change the background color instead of duplicating stuff.
 2015-01-21 09:51:12 +02: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
Chris Rebert
2e20e67dc1 Document sticky :hover on mobile browsers; fixes #12832 2015-01-20 19:22:20 -08:00
Chris Rebert
07a3ea5f54 Add .glyphicon-* aliases for other ISO 4217-ish currency codes 
Fixes #15617.
 2015-01-20 16:24:48 -08:00
Mark Otto
24aad4fe3a customizer typo 2015-01-19 09:19:09 -08:00
Mark Otto
fa47de717e grunt 2015-01-19 08:33:33 -08:00
Mark Otto
c683e7dea7 bump versions 2015-01-19 08:32:13 -08:00
Mark Otto
ce29def7a6 grunt 2015-01-19 08:27:15 -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
Mark Otto
06c00d5591 Merge branch 'master' of github.com:twbs/bootstrap 2015-01-18 13:39:50 -08:00
Mark Otto
db8eeaa17a Fixes #15142: Add position: relative; to .dropup for proper placement of menus 2015-01-18 13:39:40 -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
Mark Otto
1bf1ba7103 Merge branch 'master' into pr/15278 
Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/assets/js/customize.min.js
	docs/assets/js/raw-files.min.js
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
 2015-01-18 12:24:29 -08:00
Mark Otto
22b79dae3c grunt 2015-01-18 12:22:43 -08:00
Chris Rebert
8a1efe91df #15576 errata: #15298 also reproduces on Linux 
See https://github.com/twbs/bootstrap/issues/15298#issuecomment-69216754
 2015-01-16 15:16:52 -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
Mark Otto
ec2ccf4219 Merge branch 'master' of github.com:twbs/bootstrap 2015-01-15 15:51:12 -08:00
Mark Otto
d4f1331e51 grunt 2015-01-15 15:51:02 -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
7164d84953 Add Wall of Browser Bugs entry for #15298 
[skip sauce]
 2015-01-15 11:10:02 -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
Chris Rebert
ccc3eb5cc6 document usage of npm package; fixes #15127 
[skip sauce]
 2015-01-14 18:43:08 -08:00
Chris Rebert
7b84705286 Document that .form-inline & .form-horizontal work fine on non-<form>s too 
Fixes #15555
[skip sauce]
 2015-01-13 17:36:37 -08:00
Chris Rebert
fb6622a7d4 Document that calling tooltip/popover .show()/.hide() qualifies as manual triggering 
Fixes #15465

[skip sauce]
 2015-01-13 17:06:31 -08:00
Chris Rebert
82d786b5fe Filed http://openradar.appspot.com/19435018 
Refs #14868
 2015-01-09 19:39:33 -08:00
Chris Rebert
dbe38e89d0 Filed http://openradar.appspot.com/19434933 
Refs #15205
 2015-01-09 19:16:06 -08:00
Chris Rebert
4576dbae95 Filed http://openradar.appspot.com/19434878 
Refs #11266, #13098
 2015-01-09 19:04:42 -08:00
Chris Rebert
aa62f1b944 http://crbug.com/377346 is claimed to be fixed in Chrome 41 
So remove its entry from the Wall of Browser Bugs.
Refs #13892, #14037

[skip sauce]
 2015-01-09 15:04:59 -08:00
Chris Rebert
901ece7996 add pointer to Masonry in the thumbnail docs 2015-01-08 13:35:05 -08:00
XhmikosR
9db1de2a3a Update jQuery to v1.11.2. 2015-01-07 00:31:18 +02:00
Chris Rebert
be6dc3a3c9 Add example of using feedback icons with .input-group ; fixes #15332 2015-01-05 16:19:56 -08:00
Chris Rebert
19222bfe89 overview.html: add missing <p> 2015-01-03 22:05:49 -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
Chris Rebert
45f5841785 Merge pull request #15464 from twbs/address-15419 
Address #15419
 2014-12-31 16:11:04 -08:00
XhmikosR
1b8f00b389 Merge pull request #15292 from twbs/customize-icon 
Use a glyphicon instead of the unicode character.
 2014-12-31 19:17:46 +02: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
XhmikosR
13d7cc7d4c Use a glyphicon instead of the unicode character. 2014-12-30 09:56:24 +02:00
Chris Rebert
35073fc128 grunt build-glyphicons-data 2014-12-29 17:01:05 -08:00
Mark Otto
977646d7a0 grunt 2014-12-22 19:48:48 -08:00
Mark Otto
b615bd938b Merge branch 'master' of https://github.com/twbs/bootstrap 
Conflicts:
	dist/css/bootstrap.css.map
 2014-12-22 19:30:51 -08:00
Mark Otto
c4a23cc040 grunt 2014-12-22 19:18:26 -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
Chris Rebert
dc7ab34cc9 http://crbug.com/438064 has been fixed 
Refs #14972

[skip sauce]
[skip validator]
 2014-12-22 12:15:44 -08:00