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

11300 Commits

Author SHA1 Message Date
XhmikosR
438cae9d90 Revert "Update ZeroClipboard and remove Copy buttons when Flash is unavailable"
This reverts commit 229e888929.

ZeroClipboard v2.x drops IE < 9 support.
2015-04-29 08:55:29 +03:00
XhmikosR
16a44c208d Fix dab6a4f0e3. 2015-04-29 08:54:32 +03:00
XhmikosR
3b8e84dc87 Merge pull request #16384 from twbs/cleancss-workaround
dropdowns.less: Add space before IE8 workaround.
2015-04-29 08:49:30 +03:00
XhmikosR
5ca44f94ac Run grunt. 2015-04-28 14:24:37 +03:00
XhmikosR
27ada0f5e2 dropdowns.less: Add space before IE8 workaround.
This in turn works around an issue with clean-css (fixed in 3.2.6). So this basically is just a consistency change.
2015-04-28 14:24:33 +03:00
Bootstrap's Grunt bot
e6438592e9 automatic grunt dist
[ci skip]
2015-04-28 09:20:25 +00:00
XhmikosR
2bc9d70069 Update clean-css to v3.2.6. 2015-04-28 12:12:05 +03:00
XhmikosR
86400070b5 Bump copyright year.
[ci skip]
2015-04-28 11:40:42 +03:00
Bootstrap's Grunt bot
a9137bd621 automatic grunt dist
[ci skip]
2015-04-28 08:19:19 +00:00
XhmikosR
fae8c5d0dc Add package.js in Grunt tasks. 2015-04-28 11:03:37 +03:00
XhmikosR
3e7ca3bbc8 Minor lint tweaks. 2015-04-28 11:03:37 +03:00
Chris Rebert
4e027718a8 Merge pull request #16382 from twbs/bump-sauce
Bump grunt-saucelabs to v8.6.1
2015-04-28 00:56:28 -07:00
Chris Rebert
1eb8c16f49 Bump grunt-saucelabs to v8.6.1 2015-04-28 00:38:47 -07:00
Chris Rebert
8c2d726e17 update shrinkwrap 2015-04-28 00:38:21 -07:00
Mark Otto
421eacb1b1 Merge pull request #16381 from twbs/docs_anchors
Scope anchorjs to immediate children
2015-04-27 22:25:59 -07:00
Mark Otto
dab6a4f0e3 scope anchorjs to immediate children, fixes #16129 2015-04-27 14:16:27 -07:00
Bootstrap's Grunt bot
d87b7a037b automatic grunt dist
[ci skip]
2015-04-27 18:30:49 +00:00
F A T
aa479892d5 Merge pull request #16152 from jarthod/tooltip-placement-viewport-fix
Tooltip/popover: Fix auto placement to use viewport
2015-04-27 11:28:54 -07:00
Chris Rebert
cc8567d784 Merge pull request #16379 from twbs/bower-json
More bower.json fixes
2015-04-27 10:52:18 -07:00
Chris Rebert
f1e1411536 bower.json: Add license field
[ci skip]
2015-04-27 10:49:55 -07:00
Chris Rebert
52d8a0c78e bower.json: rm moot version field
Per a325da3d79
2015-04-27 10:44:09 -07:00
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