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

10954 Commits

Author SHA1 Message Date
Heinrich Fenkart
9ea98561df Merge pull request #15913 from twbs/scrollspy-consistency
ScrollSpy: Small style consistency adjustments
2015-02-25 02:03:52 +01: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
Heinrich Fenkart
6e0c843223 ScrollSpy: Small style consistency adjustments 2015-02-25 01:37:13 +01: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
Chris Rebert
eefa0ada96 Merge pull request #15908 from kkirsche/bumpMarkdownIt
Bump markdown-it to ^3.0.7
2015-02-24 15:55:26 -08:00
Chris Rebert
a1fd86cdf9 Merge pull request #15907 from twbs/time-grunt
bump time-grunt to ^1.1.0
2015-02-24 14:27:21 -08:00
Kevin Kirsche
2aab06bbaa Bump markdown it to 3.0.7
Bump markdown it to 3.0.7

3.0.7 / 2015-02-22

Match table columns count by header.
Added basic CLI support.
Added \v \f to valid whitespaces.
Use external package for unicode data (punctuation).
2015-02-24 17:20:29 -05:00
Chris Rebert
7f7c7901ae bump time-grunt to ^1.1.0 2015-02-24 14:14:59 -08:00
Chris Rebert
2a6207c0c9 Merge pull request #15904 from kkirsche/patch-8
Closes #15904
2015-02-24 14:11:03 -08:00
Kevin Kirsche
696fc2e53c Add unit test of aria-expanded to dropdown suite
Redo of #15876
2015-02-24 14:09:08 -08:00
Chris Rebert
19fc014397 Merge pull request #15905 from kkirsche/modalAriaTests
Add unit tests for aria-hidden to modal suite
2015-02-24 13:37:08 -08:00
Kevin Kirsche
30d8cdf639 Add tests for aria-hidden of modal
Add tests for `aria-hidden` of modal

Use strictEqual of 1 here instead of 2 asserts
2015-02-24 16:29:40 -05:00
Chris Rebert
ecd469ec16 Merge pull request #15893 from twbs/qunit-modern
Modernize QUnit usage by avoiding usage of global functions
2015-02-24 11:47:29 -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
Patrick H. Lauke
feda77f127 Merge pull request #15898 from coliff/patch-3
Change CC link in footer to HTTPS
2015-02-24 13:55:31 +00:00
Christian
1ec651b3cd Update footer.html
Update Creative Commons link to HTTPS.
2015-02-24 22:47:03 +09:00
Chris Rebert
9c75c855c6 JS unit tests: equal() => strictEqual()
[skip validator]
2015-02-23 22:43:17 -08:00
Chris Rebert
f4b734eebd Merge pull request #15894 from twbs/bump-qunit
upgrade to QUnit v1.17.1
2015-02-23 22:25:09 -08:00
Chris Rebert
bda4fe87ca upgrade to QUnit v1.17.1
[skip validator]
2015-02-23 22:18:51 -08:00
Chris Rebert
118b8c2695 JS unit tests: use QUnit.module() & QUnit.test() everywhere
[skip validator]
2015-02-23 22:14:11 -08:00
Chris Rebert
7c19fee3f1 JS unit tests: use modern QUnit assert object everywhere 2015-02-23 22:14:11 -08: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
Bootstrap's Grunt bot
1cbbeef47c automatic grunt dist 2015-02-24 02:41:30 +00:00
Steven Black
3e2dee6bd5 Normalized the heading hierarchy in the documentation for the Labels component. 2015-02-23 21:35:37 -05:00
Heinrich Fenkart
16479e9051 Merge pull request #15378 from twbs/fix-ie-modal-scrollbar-for-realz
Modal: Work around IE scrollbars not taking up page width
2015-02-24 03:33:32 +01: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
Chris Rebert
68fef8c247 Merge pull request #15867 from twbs/sauce-ios
Use OS X 10.10 for Sauce iPhone simulator
2015-02-22 19:33:14 -08:00
Chris Rebert
9bdaf03607 Use OS X 10.10 for Sauce iPhone simulator
[skip validator]
2015-02-22 19:01:36 -08:00
Chris Rebert
de31b61e42 Merge pull request #15866 from twbs/bump-sauce
Bump grunt-saucelabs to ~8.6.0
2015-02-22 19:00:00 -08:00
Chris Rebert
d8ffd57b93 update shrinkwrap
[skip validator]
2015-02-22 18:47:00 -08:00
Chris Rebert
65d209e257 bump grunt-saucelabs to ~8.6.0 2015-02-22 18:42:23 -08:00
Chris Rebert
33d49f6324 Merge pull request #15862 from dante2008/contri-doc-typo
Fix a typo in the contributing doc.
2015-02-21 21:28:27 -08:00