diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 906ffbe6..19653d70 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -95,6 +95,8 @@ The process described here has several goals: - Engage the community in working toward the best possible Playground UX - Enable a sustainable system for the Playground's maintainers to review contributions +PRs should be created against the `staging` branch, which is currently the default branch of the repo. + Please follow the [styleguides](#styleguides) to have your contribution considered by the maintainers. Reviewer(s) may ask you to complete additional design work, tests, or other changes before your pull request can be ultimately accepted. diff --git a/package-lock.json b/package-lock.json index e02b5ad3..d901e0ad 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,7 +13,7 @@ "@hotjar/browser": "^1.0.6", "@ibm/plex": "^6.1.1", "@mdx-js/react": "^2.3.0", - "@onflow/cadence-language-server": "1.0.0-preview.35", + "@onflow/cadence-language-server": "1.0.0-preview.39", "@reach/router": "^1.3.4", "@sentry/integrations": "^7.44.0", "@sentry/react": "^7.44.0", @@ -4881,9 +4881,9 @@ } }, "node_modules/@onflow/cadence-language-server": { - "version": "1.0.0-preview.35", - "resolved": "https://registry.npmjs.org/@onflow/cadence-language-server/-/cadence-language-server-1.0.0-preview.35.tgz", - "integrity": "sha512-wx4hRZyaaABVHhIsyk2o5DTB6Sda0GpftFodbQKOm803m1tB4F6cLbpfEv6cHdmBU/pNym+XeZ3me18tpPKdJg==", + "version": "1.0.0-preview.39", + "resolved": "https://registry.npmjs.org/@onflow/cadence-language-server/-/cadence-language-server-1.0.0-preview.39.tgz", + "integrity": "sha512-UERglaCCq+JmQXadFNnKoGvhCJrFdyFFTIPH7AqhmtmDFciLPM/d3AxoTLILdGtGTcQcT/xQWO7bPGM6ih9mMQ==", "dependencies": { "vscode-jsonrpc": "^8.2.0" } @@ -21981,9 +21981,9 @@ } }, "@onflow/cadence-language-server": { - "version": "1.0.0-preview.35", - "resolved": "https://registry.npmjs.org/@onflow/cadence-language-server/-/cadence-language-server-1.0.0-preview.35.tgz", - "integrity": "sha512-wx4hRZyaaABVHhIsyk2o5DTB6Sda0GpftFodbQKOm803m1tB4F6cLbpfEv6cHdmBU/pNym+XeZ3me18tpPKdJg==", + "version": "1.0.0-preview.39", + "resolved": "https://registry.npmjs.org/@onflow/cadence-language-server/-/cadence-language-server-1.0.0-preview.39.tgz", + "integrity": "sha512-UERglaCCq+JmQXadFNnKoGvhCJrFdyFFTIPH7AqhmtmDFciLPM/d3AxoTLILdGtGTcQcT/xQWO7bPGM6ih9mMQ==", "requires": { "vscode-jsonrpc": "^8.2.0" }, diff --git a/package.json b/package.json index 8d352b85..b02143da 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,7 @@ "@hotjar/browser": "^1.0.6", "@ibm/plex": "^6.1.1", "@mdx-js/react": "^2.3.0", - "@onflow/cadence-language-server": "1.0.0-preview.35", + "@onflow/cadence-language-server": "1.0.0-preview.39", "@reach/router": "^1.3.4", "@sentry/integrations": "^7.44.0", "@sentry/react": "^7.44.0", diff --git a/src/components/Editor/CadenceEditor/ControlPanel/Arguments/styles.tsx b/src/components/Editor/CadenceEditor/ControlPanel/Arguments/styles.tsx index 94c85da2..8518b242 100644 --- a/src/components/Editor/CadenceEditor/ControlPanel/Arguments/styles.tsx +++ b/src/components/Editor/CadenceEditor/ControlPanel/Arguments/styles.tsx @@ -195,6 +195,7 @@ export const SingleError = styled.div` } &.hint-warning { background-color: ${({ theme }) => theme.colors.warning}; + color: ${({ theme }) => theme.colors.warningText}; } &.hint-info { diff --git a/src/theme.ts b/src/theme.ts index c3bdd7ad..58493aa9 100644 --- a/src/theme.ts +++ b/src/theme.ts @@ -18,6 +18,7 @@ export default { errors: '#FC4723', errorBackground: '#ee431e', warning: '#ffcc00', + warningText: '#2f353f', info: '#55EE1E26', infoBackground: '#55EE1E', error: '#f44336',