Mark Otto
b718b71627
Merge branch 'v4-dev' of github.com:twbs/bootstrap into v4-dev
2016-10-30 14:48:42 -07:00
Mark Otto
8c0e1f32b6
trailing whitespace
2016-10-30 14:48:35 -07:00
Ilias
bf43936377
Fix #17964 ( #17997 )
...
* Fix #17964
Some browsers are lazy when updating dom elements after transition effects. This can be fixed by reading element properties such as offsetHeight or offsetWidth. However, creating a function using the Function constructor just to access such element, results in a violation of Content Security Policy (where applied), which in turn crashes the application. This fix actually reverts to the way this was handled in v3 and should work as intended.
2016-10-30 14:47:14 -07:00
Catalin Zalog
5099a60ffe
Fix input group sizing in Firefox
...
Firefox requires a width and flex-basis value to size the input field correctly. Despite the width being 1%, the input will size correctly at all parent widths.
http://codepen.io/zalog/pen/bpMJmv
2016-10-30 14:43:10 -07:00
Mark Otto
7ba4ac0cd3
add specific docs example for badged list group items
...
floated content has to come first in the DOM, otherwise you can get alignment bugs. in flexbox though, that's not the case. as such, i'm adding this example code to guide folks to the changes needed to move between default and flex modes.
2016-10-30 14:13:06 -07:00
Mark Otto
e11e6ec913
Merge branch 'v4-flex-list-group' of https://github.com/rosskevin/bootstrap into rosskevin-v4-flex-list-group
2016-10-30 13:49:46 -07:00
Mark Otto
d86d580d26
grunt
2016-10-30 13:40:11 -07:00
Mark Otto
864343a3cc
Merge branch 'v4-dev' of https://github.com/HMUDesign/bootstrap into HMUDesign-v4-dev
2016-10-30 13:38:44 -07:00
Mark Otto
c9dc04b4f5
grunt
2016-10-30 13:37:11 -07:00
Mark Otto
9ff198968b
Merge pull request #21046 from abvalentine/issue-20975
...
Fixes #20975 : navbar-text on navbar-dark and bg-inverse is invisible
2016-10-30 13:32:21 -07:00
Valentine Abanosimov
34ec049231
Fixes #20975 : removed trailing whitespace
2016-10-30 21:57:04 +03:00
Valentine Abanosimov
66d113be83
Fixes #20975 : removed trailing whitespace
2016-10-30 21:51:16 +03:00
Valentine Abanosimov
d6132c9a5d
Fixes #20975 : made navbar-text color on navbar-dark equal to non-hovered link color
2016-10-30 21:43:54 +03:00
Mark Otto
b071de65c7
grunt
2016-10-28 19:28:41 -07:00
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
