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

12594 Commits

Author SHA1 Message Date
Mark Otto
efd28a5e78 unnecessary comment 2015-04-26 00:14:27 -07:00
Mark Otto
219c4cbf87 remove another extend 2015-04-26 00:08:40 -07:00
Mark Otto
6489e19530 remove more old navbar styles 2015-04-26 00:07:37 -07:00
Mark Otto
b688fe822c remove the old navbar-form class 2015-04-26 00:06:45 -07:00
Mark Otto
7853a675f6 remove extends: navs and unstyled lists 2015-04-26 00:02:25 -07:00
Mark Otto
e815696dac Merge branch 'v4' of https://github.com/twbs/derpstrap into v4 2015-04-25 23:53:25 -07: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
Mark Otto
3117c98f13 nav 2015-04-25 13:20:59 -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
20543d5462 Merge pull request #109 from twbs/callout-if
re-work callout tag conditional
2015-04-24 15:05:57 -07:00
Thomas McDonald
58c208ec73 re-work callout tag conditional
Output a warning if the type is not supported and default to info
2015-04-24 22:21:12 +01: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
4c3c402b0e forms.md: fix typo 2015-04-23 17:33:35 -07:00
Chris Rebert
ff85ad1472 card.md: fix typo 2015-04-23 17:17:48 -07:00
Chris Rebert
bce2fa4f2d Merge pull request #28 from twbs/tooltip-display-none-error
throw error when trying to show tooltip on :hidden element
2015-04-23 17:15:41 -07:00
Chris Rebert
0d77644fc4 throw error when trying to show tooltip on :hidden element 2015-04-23 17:14:45 -07:00
Chris Rebert
cfcc597c85 reboot.md: fix typo 2015-04-23 16:30:12 -07:00
Chris Rebert
78c18954a8 _reboot.scss: fix typo in comment 2015-04-23 16:27:03 -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
Mark Otto
ed319e3178 fix example thumbs 2015-04-23 01:43:38 -07:00
Mark Otto
fe6756485f add card grid sizing 2015-04-23 01:33:19 -07:00
Mark Otto
37e543759b scope grid example styles better 2015-04-23 01:30:55 -07:00
Mark Otto
1770df724e update input groups to use new form control size classes 2015-04-23 01:14:43 -07:00
Mark Otto
cc7c27dd71 drop .form-horizontal 2015-04-23 01:11:10 -07:00
Mark Otto
2cf5213c15 remove commented out code 2015-04-23 01:10:57 -07:00