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

15331 Commits

Author SHA1 Message Date
Mark Otto
97b9d12c5d Merge pull request #18400 from Johann-S/collapseCard
Convert Collapse accordion from Panels to Cards
2016-10-11 10:30:14 -07:00
Johann-S
de1255b14e Collapse using card component 2016-10-11 13:25:36 +02:00
Mark Otto
4b27cc95e3 Merge pull request #20878 from twbs/downloads-copy
Updated Download docs
2016-10-10 14:20:54 -07:00
Mark Otto
ffdf64eb53 change custom builds callout to compiled builds callout 2016-10-10 14:18:42 -07:00
Mark Otto
eaac9deec2 remove commented out custom builds 2016-10-10 14:18:28 -07:00
Mark Otto
addf93a9d2 rework download options to mention source, compiled, and cdn 2016-10-10 14:18:16 -07:00
Mark Otto
259fa88e3e Merge pull request #17614 from Johann-S/patchTooltip
[Fix #17611][V4] Change destroy to dispose for tooltip in _JQueryInterface
2016-10-10 13:03:28 -07:00
Mark Otto
647db6f195 Merge pull request #20816 from bardiharborow/docs-clipboard
Strip $ from copied shell commands.
2016-10-09 21:04:41 -07:00
Mark Otto
7407518fd1 grunt 2016-10-09 20:39:50 -07:00
Mark Otto
4d725c90d6 Merge pull request #17568 from Johann-S/fixCollapseHeight
[Fix #17555][V4] fix resetting style on closing collapse
2016-10-09 20:32:40 -07:00
Bardi Harborow
3ae450e74c Render bash and powershell prompts with ::before. 2016-10-10 14:31:34 +11:00
Mark Otto
4493701ee2 grunt 2016-10-09 20:26:49 -07:00
Mark Otto
9c8913c684 one more syntax error 2016-10-09 20:26:12 -07:00
Mark Otto
949ca356de Merge pull request #20876 from bardiharborow/fix-travis
Fix Travis errors due to npm/npm#14042.
2016-10-09 20:24:15 -07:00
Mark Otto
2fa3712054 fix syntax 2016-10-09 20:23:49 -07:00
Bardi Harborow
8ff4717ebf Fix Travis errors due to npm/npm#14042. 2016-10-10 14:07:06 +11:00
Mark Otto
06fab9fc50 remove arrows from popovers docs 2016-10-09 20:03:43 -07:00
Mark Otto
ab2480f7ca remove arrow from static html demos 2016-10-09 20:02:24 -07:00
Mark Otto
e7f79b32f2 Merge branch 'tooltip-arrow' of https://github.com/brnrdog/bootstrap into brnrdog-tooltip-arrow 2016-10-09 19:56:30 -07:00
Mark Otto
ef5bbffd55 grunt 2016-10-09 19:55:58 -07:00
Mark Otto
898ffde1e6 Merge pull request #20875 from twbs/custom-select-height
Set height on custom select
2016-10-09 19:50:42 -07:00
Mark Otto
300cedfe8c Set height on custom select
Matches the changes from #20874 to the regular select element. This is really only necessary for IE and Edge near as I can tell. Fixes #20810.
2016-10-09 19:49:52 -07:00
Mark Otto
805b384519 Merge pull request #20874 from twbs/select-height
Match the height of select.form-control with input.form-control
2016-10-09 18:08:29 -07:00
Mark Otto
0c467e7b29 Match the height of select.form-control with input.form-control
Uses a local variable and some calc love to counteract the border-width (times 2) from the height of the select. Fixes #17194 and nullifies #19967.
2016-10-09 18:04:30 -07:00
Mark Otto
ea57c51082 document it a bit 2016-10-09 17:46:45 -07:00
Mark Otto
4bc154b8f9 Merge branch 'patch-10' of https://github.com/zalog/bootstrap into zalog-patch-10 2016-10-09 17:35:44 -07:00
Mark Otto
571e86e770 grunt 2016-10-09 17:26:51 -07:00
Mark Otto
6def7a5d56 Merge pull request #20555 from bardiharborow/updatedeps
Update dependencies, including Babel to v6 and zeroUnits fix.
2016-10-09 17:08:39 -07:00
Mark Otto
ed7fc8bd63 Merge pull request #20873 from twbs/flush-list-group
Reset the left and right border on list items for flush list groups
2016-10-09 16:58:01 -07:00
Mark Otto
74778b725e Reset the left and right border on list items for flush list groups
Avoid the resetting of the already set values in #20397. Fixes #20395.
2016-10-09 16:57:32 -07:00
Mark Otto
27b6cd1b53 Merge pull request #20858 from vsn4ik/patch-1
Update devDependencies badge link.
2016-10-09 16:52:02 -07:00
Mark Otto
29f196936f Merge pull request #20872 from twbs/validation-fixes
Form validation fixes
2016-10-09 16:50:49 -07:00
Mark Otto
8273e0cf82 linting 2016-10-09 16:46:47 -07:00
Mark Otto
b77b874265 fix focus shadows, if enabled 2016-10-09 16:44:04 -07:00
Mark Otto
3fa312ccdf Use correct class for validation coloring on label elements 2016-10-09 16:40:56 -07:00
Mark Otto
8750b5f81c The color is already covered in the first ruleset here 2016-10-09 16:39:02 -07:00
Mark Otto
41518d0e32 Interpolate the variable so it passes the color properly 2016-10-09 16:38:28 -07:00
Mark Otto
167129ae86 Merge pull request #20871 from twbs/document-bg-faded
Document the .bg-faded class
2016-10-09 16:35:57 -07:00
Mark Otto
909b84a289 Document the .bg-faded class
Fixes #20550.
2016-10-09 16:35:16 -07:00
Mark Otto
9516b71777 Merge pull request #20870 from twbs/collapse-example-fix
Don't use collapse classes on elements with padding
2016-10-09 16:32:45 -07:00
Mark Otto
b7444eb82a Don't use collapse classes on elements with padding
Fixes #20600.
2016-10-09 16:32:19 -07:00
Mark Otto
8187b9a2d3 Merge pull request #20869 from twbs/static-control
v4 Static form control sizing
2016-10-09 16:25:41 -07:00
Mark Otto
9ac7e868df remove un-needed comment 2016-10-09 16:18:12 -07:00
Mark Otto
53ce4da835 add transparent border to match .form-control height 2016-10-09 16:17:48 -07:00
Mark Otto
55e130f88f Update static form control
- Remove margin-bottom override in favor of .mb-0 utility class
- Apply the input line-height styles to match
- Remove the min-height to match the input
2016-10-09 16:16:13 -07:00
Mark Otto
fc13ac2701 Merge pull request #20868 from twbs/inline-form-input-group
Ensure input groups behavior appropriately in inline forms
2016-10-09 16:04:22 -07:00
Mark Otto
cab2d5951d Ensure input groups behavior appropriately in inline forms
Overrides the default width: 100% with an auto. Fixes #20752.
2016-10-09 16:00:30 -07:00
Mark Otto
b04e9fb87c separate out the custom html example 2016-10-09 15:35:52 -07:00
Mark Otto
d212ff80ae Merge branch 'v4-dev' of https://github.com/dumb/bootstrap into dumb-v4-dev 2016-10-09 15:29:26 -07:00
Mark Otto
9159ad307f remove those files from the diff 2016-10-09 15:14:25 -07:00