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

14953 Commits

Author SHA1 Message Date
Mark Otto
16947ffa88 Merge pull request #20933 from twbs/alert-padding-vars
Switch to separate vars for alert vertical/horizontal padding
2016-10-18 23:42:16 -07:00
Mark Otto
1543738890 grunt 2016-10-18 20:03:42 -07:00
Mark Otto
805ae2b46c Merge pull request #20932 from twbs/align-utils
Add vertical-align utilities
2016-10-18 19:59:44 -07:00
Mark Otto
2e4fab63de fix markup validation 2016-10-18 19:31:47 -07:00
Mark Otto
6321f9342e Switch to separate vars for alert vertical/horizontal padding 2016-10-18 19:18:06 -07:00
Mark Otto
62a129184d Add vertical-align utilities
- Adds six new utils for vertical-align property
- Documents the additional classes in the utils docs
2016-10-18 19:15:58 -07:00
Mark Otto
6d6538fc81 grunt 2016-10-16 19:44:11 -07:00
Mark Otto
5b7ec495e3 Merge pull request #20918 from twbs/revert-20867-dedupe-sm-vars
Revert "Drop the $small-font-size variable for the newer $font-size-sm one"
2016-10-16 19:42:02 -07:00
Mark Otto
daf783f781 Merge pull request #20915 from bardiharborow/sauce
Change SauceLabs iPhone test to use Appium.
2016-10-16 19:09:37 -07:00
Mark Otto
227f066650 Revert "Drop the $small-font-size variable for the newer $font-size-sm one" 2016-10-16 18:49:55 -07:00
Bardi Harborow
fdb5af3bd9 Change SauceLabs iPhone test to use Appium. 2016-10-17 02:26:16 +11:00
Mark Otto
7a3459c0b1 Merge pull request #20890 from bardiharborow/scrollspy-docs
Update scrollspy navbar example.
2016-10-15 13:39:41 -07:00
Mark Otto
7837d6e208 Merge pull request #20898 from roooodcastro/issue-20897
Fixed #20897 by changing btn-default to btn-secondary in docs for V4
2016-10-15 13:38:53 -07:00
Rodrigo Castro
6e2d46db86 Fixes #20897 - Changed btn-default for btn-secondary on V4's Modal documentation page 2016-10-13 15:35:20 -03:00
Bardi Harborow
9b86a6b41d Update scrollspy navbar example. 2016-10-13 11:08:15 +11:00
Mark Otto
cf5d94f6d5 Merge pull request #20882 from vsn4ik/v4-dev-fix-utilites-classes
v4: Fix outdated utilites classes
2016-10-11 20:56:15 -07:00
vsn4ik
85327e4f9a v4: Fix outdated utilites classes 2016-10-12 01:46:10 +03:00
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