Skip to content

Spectrum tokens 17 resolve #963

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 24 commits into from
Sep 22, 2020
Merged

Conversation

GarthDB
Copy link
Member

@GarthDB GarthDB commented Sep 22, 2020

Description

Fixes the merge conflicts between spectrum-tokens-17 and main.

How and where has this been tested?

  • How this was tested:
  • Browser(s) and OS(s) this was tested with: Chrome

To-do list

  • If my change impacts other components, I have tested to make sure they don't break.
  • If my change impacts documentation, I have updated the documentation accordingly.
  • I have read the CONTRIBUTING document.
  • This pull request is ready to merge.

milanbrkic-ms and others added 24 commits March 11, 2020 22:17
transition box-shadow is hard, opacity is easy
Bumps [prismjs](https://github.com/PrismJS/prism) from 1.17.1 to 1.21.0.
- [Release notes](https://github.com/PrismJS/prism/releases)
- [Changelog](https://github.com/PrismJS/prism/blob/master/CHANGELOG.md)
- [Commits](PrismJS/prism@v1.17.1...v1.21.0)

Signed-off-by: dependabot[bot] <support@github.com>
* fix: fix the issues caused by component rename

* fix: fix package security vulnerabilities

Co-authored-by: Jian Liao <jianliao@adobe.com>
* test: update VRT instruction documentation

* docs: fixed typo

Co-authored-by: Jian Liao <jianliao@adobe.com>
Co-authored-by: Garth Braithwaite <garthdb@gmail.com>
…21.0

build(deps-dev): bump prismjs from 1.17.1 to 1.21.0
partly resolves #786

This will not work in IE11 or with our legacy build. It must support CSS vars.
@GarthDB GarthDB force-pushed the spectrum-tokens-17-resolve branch from daef5fb to 8cafffa Compare September 22, 2020 22:34
@GarthDB GarthDB requested a review from lazd September 22, 2020 22:38
@GarthDB GarthDB merged commit 63f8e84 into spectrum-tokens-17 Sep 22, 2020
@GarthDB GarthDB deleted the spectrum-tokens-17-resolve branch September 22, 2020 22:39
@adobe-spectrum-bot
Copy link
Collaborator

VRT successfully! 🎊

View the VRT result

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants