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

11276 Commits

Author SHA1 Message Date
Chris Rebert
63f989849d Merge pull request #16378 from twbs/bower-moduleType
bower.json: set `moduleType` to `globals`
2015-04-27 10:39:53 -07:00
Chris Rebert
23445e0cb2 bower.json: set moduleType to globals
Per 632ff90a2c (commitcomment-10914138)
[ci skip]
2015-04-27 10:39:16 -07:00
Chris Rebert
cdb37dce3a Set box-sizing: border-box on .container-viewport in #16142 testcase
Otherwise, the test doesn't properly fail when the fix is reverted.
2015-04-27 01:23:39 -07:00
Bootstrap's Grunt bot
71597a4424 automatic grunt dist
[ci skip]
2015-04-27 08:20:49 +00:00
Adrien
37a10d37c1 Compare tooltip right offset to viewport right offset (and not width)
Closes #16142 by merging it.
2015-04-27 01:13:16 -07:00
Bootstrap's Grunt bot
d0926f2deb automatic grunt dist
[ci skip]
2015-04-26 11:11:05 +00:00
XhmikosR
fa4d7d2bd2 Run grunt. 2015-04-26 14:03:35 +03:00
XhmikosR
8cc39a3951 Update autoprefixer.js.
Taken from https://github.com/ai/autoprefixer-rails/blob/master/vendor/autoprefixer.js

[ci skip]
2015-04-26 14:01:17 +03:00
Bootstrap's Grunt bot
2b89fd5289 automatic grunt dist
[ci skip]
2015-04-26 06:40:33 +00:00
Mark Otto
8cd3527f73 Remove inaccurate comment 2015-04-25 23:35:09 -07:00
Bootstrap's Grunt bot
f5b5fc69a8 automatic grunt dist
[ci skip]
2015-04-26 05:20:36 +00:00
Mark Otto
d34df63bde Merge pull request #16280 from arxene/issue-16270
Fixes #16270.
2015-04-25 22:17:01 -07:00
Mark Otto
ebad91b9b5 Merge pull request #16369 from vsn4ik/split_docs_dropup
DOCS: Separation of .dropdown and .dropup.
2015-04-25 22:04:08 -07:00
Bootstrap's Grunt bot
2900711db4 automatic grunt dist
[ci skip]
2015-04-26 04:50:34 +00:00
Mark Otto
1e64e720a4 Merge pull request #16333 from pine3ree/patch-2
form-group size + form-control-feedback
2015-04-25 21:45:31 -07:00
Mark Otto
2b1c06f5b1 Merge pull request #16351 from thomasphorton/gutterRounding
Round results from gutter division to prevent decimal margins and padding
2015-04-25 21:42:44 -07:00
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