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

11514 Commits

Author SHA1 Message Date
Mark Otto
4f3feed2bd Merge pull request #16350 from thomasphorton/master
Add max-width: none to .media > .img-thumbnail
2015-04-25 21:40:48 -07:00
Bootstrap's Grunt bot
3e3b331ad3 automatic grunt dist
[ci skip]
2015-04-25 20:20:30 +00:00
Chris Rebert
17aaab3de8 Merge pull request #16324 from twbs/address-16219
Throw error when tooltip/popover template has multiple top-level elements
2015-04-25 13:17:20 -07:00
Chris Rebert
fc372952e2 Throw error when tooltip/popover template has multiple top-level elements
Closes #16219.
2015-04-25 13:16:53 -07:00
Mark Otto
8949bcecd2 Merge pull request #16368 from vsn4ik/use_https_slack
Use https on herokuapp.com
2015-04-25 12:22:58 -07:00
vsn4ik
aed83c4b96 Use https on herokuapp.com 2015-04-25 21:05:49 +03:00
vsn4ik
d46f6dcbdc DOCS: Separation of .dropdown and .dropup. 2015-04-25 12:52:22 +03:00
Chris Rebert
7f7f755a09 Merge pull request #16367 from twbs/unresponsive
Ensure .form-inline in non-responsive example doesn't stack
2015-04-25 01:03:16 -07:00
Mark Otto
95a8a06f10 Link slack badge 2015-04-25 00:00:39 -07:00
Chris Rebert
84e157513f Merge pull request #16344 from twbs/sed-task
Fix #16075 by switching to maintained fork of grunt-sed
2015-04-24 23:54:27 -07:00
Thomas P. Horton
ccb53aa983 Fix collapsing .img-thumbnail due to display: table-cell clashing with max-width 2015-04-24 21:21:39 -07:00
Chris Rebert
6ae488d6ef Ensure .form-inline in non-responsive example doesn't stack; fixes #15977 2015-04-24 19:49:43 -07:00
Mark Otto
71f4abc201 Add slack badge, link to join, and update copy 2015-04-24 13:20:56 -07:00
Chris Rebert
1c57181520 Merge pull request #16359 from twbs/bower
Update bower.json to comply with new spec for `main`
2015-04-24 10:26:55 -07:00
Chris Rebert
38861984d9 bower.json: Remove bootstrap.css from main
Per https://github.com/bower/bower.json-spec/pull/43 :
> Use source files with module exports and imports over pre-built distribution files.

Also, the example in that PR doesn't include
/dist/movement.css or /dist/movement.min.css
in its `main`.

If you have a complaint about this, take it up with the Bower folks:
https://github.com/bower/bower.json-spec/issues
2015-04-24 10:20:28 -07:00
Chris Rebert
6cb9d6ce01 bower.json: Remove font files from main
Per https://github.com/bower/bower.json-spec/pull/43 :
> font files [...] are not `main` files as they are not entry-points.

If you have a complaint about this, take it up with the Bower folks:
https://github.com/bower/bower.json-spec/issues
2015-04-24 10:19:37 -07:00
Thomas P. Horton
c319d610e2 Round results from gutter division to prevent decimal margins and padding 2015-04-23 20:06:54 -07:00
Chris Rebert
be6691cc04 update shrinkwrap
[skip sauce]
[skip validator]
2015-04-23 13:12:39 -07:00
Chris Rebert
4f85fcfc28 Fix #16075 by switching to maintained fork of grunt-sed
[skip sauce]
[skip validator]
2015-04-23 12:11:57 -07:00
XhmikosR
6ba595f3ff Merge pull request #16339 from twbs/release
Grunt: extend `prep-release` task.
2015-04-23 20:17:19 +03:00
XhmikosR
f3386079f3 Grunt: extend prep-release task.
Make it so that everything is done for us to reduce the possibility of missing something when releasing.
2015-04-23 19:56:40 +03:00
XhmikosR
a2680e8b6b Run grunt.
[ci skip`
2015-04-23 09:18:46 +03:00
XhmikosR
b29c15dfc8 Update Blob.js to v2015-03-21.
[ci skip]
2015-04-23 09:18:45 +03:00
XhmikosR
6df6452619 Update FileSaver.js to v2015-03-04.
[ci skip]
2015-04-23 09:18:45 +03:00
XhmikosR
7da5f13383 Update JSZip to v2.5.0.
[ci skip]
2015-04-23 09:18:45 +03:00
XhmikosR
cd23569d49 Update uglify-js to v2.4.20.
[ci skip]
2015-04-23 09:18:45 +03:00
XhmikosR
69308dc883 Update Holder.js to v2.6.0.
[ci skip]
2015-04-23 09:18:45 +03:00
maks feltrin
d42fbb9830 form-group size + form-control-feedback
automatically feedback icon sizing inside a larger|smaller form-group.
2015-04-22 19:47:25 +02:00
Bootstrap's Grunt bot
063c1b0780 automatic grunt dist
[ci skip]
2015-04-22 05:30:27 +00: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
Bootstrap's Grunt bot
48232aad6c automatic grunt dist
[ci skip]
2015-04-22 04:50:38 +00:00
Chris Rebert
e93802b821 Merge pull request #16258 from twbs/fix-16172
Use CSS hack to fix IE8 .caret regression
2015-04-21 21:44:08 -07:00
Chris Rebert
c6b62f0cd9 Merge pull request #16147 from Johann-S/event_inserted
Fixes #16124.
2015-04-21 21:40:14 -07:00
Bootstrap's Grunt bot
7993251b1c automatic grunt dist
[ci skip]
2015-04-22 01:01:07 +00:00
Chris Rebert
c256aca13c https://github.com/necolas/normalize.css/pull/379 was rejected
Refs #15947
2015-04-21 17:53:44 -07:00
Bootstrap's Grunt bot
b5f3cd37f2 automatic grunt dist
[ci skip]
2015-04-21 06:40:36 +00:00
Niels Steenbeek
7429fc7ff9 Tooltip: Destroy $tip, $arrow, $viewport to avoid memory leak
Closes #16039.
2015-04-20 23:29:31 -07:00
XhmikosR
09f98453ce Update devDependencies. 2015-04-19 00:07:37 +03: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
Bootstrap's Grunt bot
483412a795 automatic grunt dist
[ci skip]
2015-04-17 16:20:21 +00:00
Patrick H. Lauke
8549722846 Merge pull request #16226 from patrickhlauke/radio-toggle-kbd-fix
Fix radio button toggle behavior for keyboard users
2015-04-17 18:19:11 +02:00
Chris Rebert
3a279860b0 grunt docs 2015-04-16 17:25:00 -07:00
Mark Tareshawty
229e888929 Update ZeroClipboard and remove Copy buttons when Flash is unavailable
Fixes #16269.
Closes #16301 by merging a rebased version of it.
2015-04-16 17:17:28 -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
Bootstrap's Grunt bot
e7064c7224 automatic grunt dist 2015-04-13 17:21:14 +00:00
Chris Rebert
e33801e654 Merge pull request #16279 from twbs/fix-16276
Make .btn in .btn-toolbar float:left too
2015-04-13 10:16:42 -07:00
Ray McMahan
b8a4bc1b93 Fixes #16270.
Badges now appeared vertically centered next to text. Previously, badges appeared to be somewhat lower than tall text such as h1's next to it.
2015-04-13 01:24:56 -05:00
Bootstrap's Grunt bot
a719eb69d2 automatic grunt dist 2015-04-13 00:21:28 +00:00
Chris Rebert
ee385d5980 Merge pull request #16256 from twbs/fix-16247
Add px unit to perspective property value
2015-04-12 17:16:16 -07:00