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

15152 Commits

Author SHA1 Message Date
Mark Otto
2706215d13 Merge pull request #21041 from twbs/horizontal-form-validation-example
Horizontal form validation example
2016-10-28 19:19:33 -07:00
Mark Otto
6a11ae580d add horizontal form examples 2016-10-28 16:38:30 -07:00
Mark Otto
a6cd4937af rework some copy 2016-10-28 16:36:09 -07:00
Mark Otto
cfd6e92ff6 include .col-form-label in the form validation field mixin 2016-10-28 16:35:47 -07:00
Mark Otto
c01fa6b369 Merge pull request #17536 from Johann-S/testPadding
[Fix #17400] Add tests about padding restoration
2016-10-28 13:46:14 -07:00
Mark Otto
cecf0db2ce grunt 2016-10-27 22:29:10 -07:00
Mark Otto
ccb5248205 Merge branch 'issue19217' of https://github.com/alberto/bootstrap into alberto-issue19217 2016-10-27 22:28:24 -07:00
Mark Otto
63a524b352 Merge pull request #19887 from ryanburnett/v4-dev
Alphabetized carousel options & added "ride" to it
2016-10-27 22:21:06 -07:00
Mark Otto
20178076ee Merge pull request #19915 from zalog/patch-9
Zero out the default margin-bottom on label.custom-file
2016-10-27 22:20:26 -07:00
Mark Otto
9d011a8a6f Merge pull request #20101 from heath3/patch-1
Re-use 'between' mixin for 'only' mixin
2016-10-27 22:17:48 -07:00
Mark Otto
96d8553bec grunt 2016-10-27 22:11:22 -07:00
Mark Otto
bc076d71b3 follow up to #20441: move file to correct place 2016-10-27 22:11:19 -07:00
Mark Otto
34d88c79e6 Merge pull request #20225 from morishitter/v4-dev
Add some properties to the list of property order in .scss-lint.yml
2016-10-27 22:09:10 -07:00
Mark Otto
8f0429973d Merge pull request #20441 from cortopy/visibility-mixin
Visibility mixin
2016-10-27 22:06:47 -07:00
Mark Otto
2df2efc1fb Merge pull request #18851 from ju1ius/patch-1
Don't clearfix if flexbox is enabled. Fixes #18849
2016-10-27 21:58:14 -07:00
Mark Otto
d23163a483 Merge pull request #21032 from twbs/flexbox-input-group
Proper input group sizing and alignment in flexbox mode
2016-10-27 21:23:48 -07:00
Mark Otto
f655343ac9 Merge pull request #21033 from twbs/label-less-custom-controls
Add a min-height: 1.5rem; to custom controls
2016-10-27 21:23:04 -07:00
Mark Otto
4a05116020 Merge pull request #21034 from twbs/better-custom-control-alignment
Calculcate the top offset for custom control indicators
2016-10-27 21:22:24 -07:00
Mark Otto
fa0605132f grunt 2016-10-27 20:04:33 -07:00
Mark Otto
6608b2a9ee Merge branch 'v4-dev' of github.com:twbs/bootstrap into v4-dev 2016-10-27 20:04:04 -07:00
Mark Otto
fde7101f13 grunt 2016-10-27 20:03:56 -07:00
Mark Otto
61b01f9b28 Merge branch 'patch-1' of https://github.com/tomhorvat/bootstrap into tomhorvat-patch-1 2016-10-27 20:02:59 -07:00
Mark Otto
020a8c6918 Merge pull request #20734 from beausmith/button-outline-variant
Remove hard-coded value in button-outline-variant
2016-10-27 19:58:48 -07:00
Mark Otto
fbed329218 Merge pull request #21035 from judetucker/badge_cleanup
cleaned up the docs to complete the change from .tag to .badge
2016-10-27 19:57:11 -07:00
Mark Otto
cfc8e40da9 Merge branch 'v4-dev' of github.com:twbs/bootstrap into v4-dev 2016-10-27 19:56:55 -07:00
judetucker
b3944c2334 cleaned up the docs to complete the change from tag to badge 2016-10-27 15:03:45 -07:00
Mark Otto
2dcc50f017 Calculcate the top offset for custom control indicators
Fixes #21023.

Uses some math functions to determine what the offset should be. This is helpful for those who customize the size of their indicators and still want them vertically centered.
2016-10-27 14:41:12 -07:00
Mark Otto
1421ca5b87 Add a min-height: 1.5rem; to custom controls
Fixes #20730.

This change computes the minimum needed height of what a single line of text would be for the custom checkboxes/radios. This is required because our custom control indicators are positioned absolutely, meaning they cannot be clearfixed or anything like that. Using a computed value means it should scale nicely in case of customization
2016-10-27 14:32:56 -07:00
Mark Otto
78c9757236 property order 2016-10-27 13:46:16 -07:00
Mark Otto
259a420d70 Ensure proper sizing of and alignment of content within input group addons and buttons
Fixes #20927.
2016-10-27 13:40:55 -07:00
Mark Otto
da6b5a0551 Merge pull request #21028 from judetucker/card_docs_float
Docs correction to change .pull to .float on Card docs
2016-10-27 11:51:06 -07:00
Mark Otto
93ac9381be Fixes #17631: Add mention of removed .btn-group-justified
It was only available for anchor elements and not button elements, so it was super weird to support. Might be bringing it back with flexbox though in v4 as an option.
2016-10-27 10:31:37 -07:00
Mark Otto
9dbfc90eae grunt 2016-10-27 09:51:22 -07:00
Mark Otto
a26080c047 rework flex grid autolayout docs
Adds clearer headings to each section, reworks some copy to be more direct.
2016-10-27 09:50:25 -07:00
Mark Otto
26c33fa5ed unrelated change; bold that stuff to emphasize it 2016-10-27 09:49:57 -07:00
Mark Otto
e2068d0e53 Merge branch 'auto-flex-col' of https://github.com/alanmoo/bootstrap into alanmoo-auto-flex-col 2016-10-27 09:41:33 -07:00
Mark Otto
5b266437e7 Merge pull request #21027 from twbs/document-zindex
Document zindex
2016-10-27 09:39:27 -07:00
Mark Otto
115a37db1a Change variable for modal backdrop zindex, rearrange to be ordered from lowest to highest 2016-10-27 09:31:38 -07:00
Mark Otto
3cc0239903 Document our z-index values
Fixes #18532
2016-10-27 09:26:23 -07:00
Mark Otto
8ed7ebcd63 fixes #18565: mention carousel sizing in docs 2016-10-27 09:19:07 -07:00
Mark Otto
abc9a526d5 Fixes #20498: Warn about flexbox bugs in our flex grid docs 2016-10-27 09:03:45 -07:00
Mark Otto
ab49e3f7e6 fixes #21000: Remove margin from static form control example 2016-10-27 08:58:12 -07:00
Mark Otto
42dfa7994d Merge pull request #21024 from eigan/fixdoc-secondary-dropdown
Docfix: Change label from Default to Secondary, and reorder dropdowns
2016-10-27 08:53:52 -07:00
Einar Gangsø
45cbbad871 Docfix: Typo default -> secondary, and reorder 2016-10-27 10:12:14 +02:00
judetucker
7cc086e2c1 change the header nav description to include the new float 2016-10-26 22:05:46 -07:00
Mark Otto
52c84a1cb6 Merge pull request #20938 from JPeer264/feature/sass-doc
Docs: Sass Variables Table of Contents
2016-10-26 21:20:25 -07:00
Mark Otto
7aab3d9573 Merge branch 'v4-dev' of github.com:twbs/bootstrap into v4-dev 2016-10-26 21:16:06 -07:00
Mark Otto
a0599a245d Follow up to #20982 to fix css for modals 2016-10-26 21:15:31 -07:00
Mark Otto
261ed70a18 Merge pull request #21019 from Starsam80/fix-collapse
Rename .in to .active to fix collapse
2016-10-26 21:14:16 -07:00
Mark Otto
bcbbc8eeda Merge pull request #21020 from twbs/rename-tag-to-badge
Rename .tag to .badge to avoid conflicting with WordPress
2016-10-26 19:53:50 -07:00