Merged
Conversation
Johann-S
approved these changes
Jan 13, 2019
bkdotcom
added a commit
to bkdotcom/bootstrap
that referenced
this pull request
Jan 16, 2019
* v4-dev: (34 commits) tests: use jQuery from node_modules. (twbs#28059) Fix `js-main` script. (twbs#28057) Make progress animation respect `$enable-transitions` and `prefers-reduced-motion` media query Examples: add tabindex="-1" and aria-disabled="true" on disabled links Clean up .gitignore. (twbs#28050) Fix Carousel's touch option to not add touch listeners when set to false (twbs#28046) Remove map-merge (twbs#28033) Cleanup popover arrows (twbs#28008) Sync dropdown font size to base font size Sync dropdown font size with btn font size Remove background from nested tables Add some margin below the buttons Fix background size y Minify background property Combine background properties into one Prevent useless property rendering Don't render a background by default Prevent rendering of color property by default Change comment heading title to `Typography` (twbs#28032) Align toast variables (twbs#28041) ... # Conflicts: # package.json
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The toast variables were not aligned like the rest of the variables.