Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions .babelrc
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,7 @@
"@babel/plugin-syntax-dynamic-import",
"@babel/plugin-transform-async-to-generator",
"@babel/plugin-proposal-object-rest-spread",
["react-intl", {
"messagesDir": "./translations/messages/"
}]],
"react-intl"],
"presets": [
"@babel/preset-env",
"@babel/preset-react"
Expand Down
6 changes: 4 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"balance-text": "^3.3.1",
"base64-loader": "^1.0.0",
"bowser": "^1.9.4",
"cat-blocks": "npm:scratch-blocks@0.1.0-prerelease.20220318143026",
"cat-blocks": "workspace:scratch-blocks@*",
"classnames": "^2.2.6",
"computed-style-to-inline-style": "^3.0.0",
"cookie": "^0.6.0",
Expand Down Expand Up @@ -93,7 +93,7 @@
"redux-throttle": "^0.1.1",
"regenerator-runtime": "^0.14.1",
"scratch-audio": "^1.0.0",
"scratch-blocks": "^1.1.6",
"scratch-blocks": "workspace:*",
"scratch-l10n": "^3.18.3",
"scratch-paint": "^2.2.151",
"scratch-render": "^1.0.0",
Expand Down Expand Up @@ -129,6 +129,7 @@
"@commitlint/config-conventional": "17.8.1",
"babel-core": "7.0.0-bridge.0",
"babel-loader": "9.1.3",
"babel-plugin-react-intl": "^8.2.25",
"cross-fetch": "^4.0.0",
"enzyme": "3.11.0",
"enzyme-adapter-react-16": "1.15.8",
Expand All @@ -149,6 +150,7 @@
"redux-mock-store": "1.5.4",
"rimraf": "2.7.1",
"scratch-semantic-release-config": "1.0.14",
"scratch-blocks": "workspace:*",
"scratch-webpack-configuration": "1.3.0",
"selenium-webdriver": "3.6.0",
"semantic-release": "19.0.5",
Expand Down
5,082 changes: 2,882 additions & 2,200 deletions pnpm-lock.yaml

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/components/monitor/monitor.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ const modes = {
const getCategoryColor = (theme, category) => {
const colors = getColorsForTheme(theme);
return {
background: colors[categoryColorMap[category]].primary,
background: colors[categoryColorMap[category]].colourPrimary,
text: colors.text
};
};
Expand Down
Loading