diff --git a/game_frontend/src/components/Code/__snapshots__/index.test.js.snap b/game_frontend/src/components/Code/__snapshots__/index.test.js.snap
index c4fa2a2e6..0b4cdb68c 100644
--- a/game_frontend/src/components/Code/__snapshots__/index.test.js.snap
+++ b/game_frontend/src/components/Code/__snapshots__/index.test.js.snap
@@ -3,7 +3,7 @@
exports[`
renders correctly 1`] = `
.c0 {
font-family: 'Source Code Pro',monospace;
- color: #FFFFFF;
+ color: #606060;
}
matches snapshot 1`] = `
/>
matches snapshot 1`] = `
"A700": "#616161",
},
"primary": Object {
- "contrastText": "rgba(0, 0, 0, 0.87)",
- "dark": "rgb(178, 178, 178)",
- "light": "rgb(255, 255, 255)",
- "main": "#FFFFFF",
+ "contrastText": "#fff",
+ "dark": "rgb(67, 67, 67)",
+ "light": "rgb(127, 127, 127)",
+ "main": "#606060",
},
"secondary": Object {
- "contrastText": "rgba(0, 0, 0, 0.87)",
- "dark": "rgb(144, 143, 137)",
- "light": "rgb(216, 215, 208)",
- "main": "#CFCDC5",
+ "contrastText": "#fff",
+ "dark": "rgb(156, 65, 162)",
+ "light": "rgb(229, 126, 236)",
+ "main": "#DF5EE8",
},
"text": Object {
"disabled": "rgba(255, 255, 255, 0.5)",
@@ -231,9 +232,6 @@ exports[` matches snapshot 1`] = `
"spacing": Object {
"unit": 8,
},
- "text": Object {
- "secondary": "#FFFFFF",
- },
"transitions": Object {
"create": [Function],
"duration": Object {
@@ -467,16 +465,16 @@ exports[` matches snapshot 1`] = `
"A700": "#616161",
},
"primary": Object {
- "contrastText": "rgba(0, 0, 0, 0.87)",
- "dark": "rgb(178, 178, 178)",
- "light": "rgb(255, 255, 255)",
- "main": "#FFFFFF",
+ "contrastText": "#fff",
+ "dark": "rgb(67, 67, 67)",
+ "light": "rgb(127, 127, 127)",
+ "main": "#606060",
},
"secondary": Object {
- "contrastText": "rgba(0, 0, 0, 0.87)",
- "dark": "rgb(144, 143, 137)",
- "light": "rgb(216, 215, 208)",
- "main": "#CFCDC5",
+ "contrastText": "#fff",
+ "dark": "rgb(156, 65, 162)",
+ "light": "rgb(229, 126, 236)",
+ "main": "#DF5EE8",
},
"text": Object {
"disabled": "rgba(255, 255, 255, 0.5)",
@@ -522,9 +520,6 @@ exports[` matches snapshot 1`] = `
"spacing": Object {
"unit": 8,
},
- "text": Object {
- "secondary": "#FFFFFF",
- },
"transitions": Object {
"create": [Function],
"duration": Object {
diff --git a/game_frontend/src/components/IDEEditor/index.js b/game_frontend/src/components/IDEEditor/index.js
index 86a2e506f..5785d5b6d 100644
--- a/game_frontend/src/components/IDEEditor/index.js
+++ b/game_frontend/src/components/IDEEditor/index.js
@@ -54,6 +54,7 @@ export class IDEEditor extends PureComponent {
fontFamily: this.props.theme.additionalVariables.typography.code.fontFamily
}} />
renders correctly 1`] = `
diff --git a/game_frontend/src/components/NavigationBar/index.js b/game_frontend/src/components/NavigationBar/index.js
index 1e672a7a5..3a37af27f 100644
--- a/game_frontend/src/components/NavigationBar/index.js
+++ b/game_frontend/src/components/NavigationBar/index.js
@@ -18,7 +18,6 @@ export default class NavigationBar extends Component {
return (
renders correctly with type=error 1`] = `
"A700": "#616161",
},
"primary": Object {
- "contrastText": "rgba(0, 0, 0, 0.87)",
- "dark": "rgb(178, 178, 178)",
- "light": "rgb(255, 255, 255)",
- "main": "#FFFFFF",
+ "contrastText": "#fff",
+ "dark": "rgb(67, 67, 67)",
+ "light": "rgb(127, 127, 127)",
+ "main": "#606060",
},
"secondary": Object {
- "contrastText": "rgba(0, 0, 0, 0.87)",
- "dark": "rgb(144, 143, 137)",
- "light": "rgb(216, 215, 208)",
- "main": "#CFCDC5",
+ "contrastText": "#fff",
+ "dark": "rgb(156, 65, 162)",
+ "light": "rgb(229, 126, 236)",
+ "main": "#DF5EE8",
},
"text": Object {
"disabled": "rgba(0, 0, 0, 0.38)",
@@ -165,9 +165,6 @@ exports[` renders correctly with type=error 1`] = `
"spacing": Object {
"unit": 8,
},
- "text": Object {
- "secondary": "#FFFFFF",
- },
"transitions": Object {
"create": [Function],
"duration": Object {
@@ -413,16 +410,16 @@ exports[` renders correctly with type=info 1`] = `
"A700": "#616161",
},
"primary": Object {
- "contrastText": "rgba(0, 0, 0, 0.87)",
- "dark": "rgb(178, 178, 178)",
- "light": "rgb(255, 255, 255)",
- "main": "#FFFFFF",
+ "contrastText": "#fff",
+ "dark": "rgb(67, 67, 67)",
+ "light": "rgb(127, 127, 127)",
+ "main": "#606060",
},
"secondary": Object {
- "contrastText": "rgba(0, 0, 0, 0.87)",
- "dark": "rgb(144, 143, 137)",
- "light": "rgb(216, 215, 208)",
- "main": "#CFCDC5",
+ "contrastText": "#fff",
+ "dark": "rgb(156, 65, 162)",
+ "light": "rgb(229, 126, 236)",
+ "main": "#DF5EE8",
},
"text": Object {
"disabled": "rgba(0, 0, 0, 0.38)",
@@ -467,9 +464,6 @@ exports[` renders correctly with type=info 1`] = `
"spacing": Object {
"unit": 8,
},
- "text": Object {
- "secondary": "#FFFFFF",
- },
"transitions": Object {
"create": [Function],
"duration": Object {
@@ -715,16 +709,16 @@ exports[` renders correctly with type=success 1`] = `
"A700": "#616161",
},
"primary": Object {
- "contrastText": "rgba(0, 0, 0, 0.87)",
- "dark": "rgb(178, 178, 178)",
- "light": "rgb(255, 255, 255)",
- "main": "#FFFFFF",
+ "contrastText": "#fff",
+ "dark": "rgb(67, 67, 67)",
+ "light": "rgb(127, 127, 127)",
+ "main": "#606060",
},
"secondary": Object {
- "contrastText": "rgba(0, 0, 0, 0.87)",
- "dark": "rgb(144, 143, 137)",
- "light": "rgb(216, 215, 208)",
- "main": "#CFCDC5",
+ "contrastText": "#fff",
+ "dark": "rgb(156, 65, 162)",
+ "light": "rgb(229, 126, 236)",
+ "main": "#DF5EE8",
},
"text": Object {
"disabled": "rgba(0, 0, 0, 0.38)",
@@ -769,9 +763,6 @@ exports[` renders correctly with type=success 1`] = `
"spacing": Object {
"unit": 8,
},
- "text": Object {
- "secondary": "#FFFFFF",
- },
"transitions": Object {
"create": [Function],
"duration": Object {
@@ -1012,16 +1003,16 @@ exports[` renders correctly with type=warning 1`] = `
"A700": "#616161",
},
"primary": Object {
- "contrastText": "rgba(0, 0, 0, 0.87)",
- "dark": "rgb(178, 178, 178)",
- "light": "rgb(255, 255, 255)",
- "main": "#FFFFFF",
+ "contrastText": "#fff",
+ "dark": "rgb(67, 67, 67)",
+ "light": "rgb(127, 127, 127)",
+ "main": "#606060",
},
"secondary": Object {
- "contrastText": "rgba(0, 0, 0, 0.87)",
- "dark": "rgb(144, 143, 137)",
- "light": "rgb(216, 215, 208)",
- "main": "#CFCDC5",
+ "contrastText": "#fff",
+ "dark": "rgb(156, 65, 162)",
+ "light": "rgb(229, 126, 236)",
+ "main": "#DF5EE8",
},
"text": Object {
"disabled": "rgba(0, 0, 0, 0.38)",
@@ -1066,9 +1057,6 @@ exports[` renders correctly with type=warning 1`] = `
"spacing": Object {
"unit": 8,
},
- "text": Object {
- "secondary": "#FFFFFF",
- },
"transitions": Object {
"create": [Function],
"duration": Object {
@@ -1329,16 +1317,16 @@ exports[` renders correctly 1`] = `
"A700": "#616161",
},
"primary": Object {
- "contrastText": "rgba(0, 0, 0, 0.87)",
- "dark": "rgb(178, 178, 178)",
- "light": "rgb(255, 255, 255)",
- "main": "#FFFFFF",
+ "contrastText": "#fff",
+ "dark": "rgb(67, 67, 67)",
+ "light": "rgb(127, 127, 127)",
+ "main": "#606060",
},
"secondary": Object {
- "contrastText": "rgba(0, 0, 0, 0.87)",
- "dark": "rgb(144, 143, 137)",
- "light": "rgb(216, 215, 208)",
- "main": "#CFCDC5",
+ "contrastText": "#fff",
+ "dark": "rgb(156, 65, 162)",
+ "light": "rgb(229, 126, 236)",
+ "main": "#DF5EE8",
},
"text": Object {
"disabled": "rgba(0, 0, 0, 0.38)",
@@ -1383,9 +1371,6 @@ exports[` renders correctly 1`] = `
"spacing": Object {
"unit": 8,
},
- "text": Object {
- "secondary": "#FFFFFF",
- },
"transitions": Object {
"create": [Function],
"duration": Object {
diff --git a/game_frontend/src/containers/IDE/__snapshots__/index.test.js.snap b/game_frontend/src/containers/IDE/__snapshots__/index.test.js.snap
index f90d2ff71..9b57a69b6 100644
--- a/game_frontend/src/containers/IDE/__snapshots__/index.test.js.snap
+++ b/game_frontend/src/containers/IDE/__snapshots__/index.test.js.snap
@@ -101,16 +101,16 @@ exports[` renders correctly 1`] = `
"A700": "#616161",
},
"primary": Object {
- "contrastText": "rgba(0, 0, 0, 0.87)",
- "dark": "rgb(178, 178, 178)",
- "light": "rgb(255, 255, 255)",
- "main": "#FFFFFF",
+ "contrastText": "#fff",
+ "dark": "rgb(67, 67, 67)",
+ "light": "rgb(127, 127, 127)",
+ "main": "#606060",
},
"secondary": Object {
- "contrastText": "rgba(0, 0, 0, 0.87)",
- "dark": "rgb(144, 143, 137)",
- "light": "rgb(216, 215, 208)",
- "main": "#CFCDC5",
+ "contrastText": "#fff",
+ "dark": "rgb(156, 65, 162)",
+ "light": "rgb(229, 126, 236)",
+ "main": "#DF5EE8",
},
"text": Object {
"disabled": "rgba(255, 255, 255, 0.5)",
@@ -156,9 +156,6 @@ exports[` renders correctly 1`] = `
"spacing": Object {
"unit": 8,
},
- "text": Object {
- "secondary": "#FFFFFF",
- },
"transitions": Object {
"create": [Function],
"duration": Object {
@@ -381,16 +378,16 @@ exports[` renders correctly 1`] = `
"A700": "#616161",
},
"primary": Object {
- "contrastText": "rgba(0, 0, 0, 0.87)",
- "dark": "rgb(178, 178, 178)",
- "light": "rgb(255, 255, 255)",
- "main": "#FFFFFF",
+ "contrastText": "#fff",
+ "dark": "rgb(67, 67, 67)",
+ "light": "rgb(127, 127, 127)",
+ "main": "#606060",
},
"secondary": Object {
- "contrastText": "rgba(0, 0, 0, 0.87)",
- "dark": "rgb(144, 143, 137)",
- "light": "rgb(216, 215, 208)",
- "main": "#CFCDC5",
+ "contrastText": "#fff",
+ "dark": "rgb(156, 65, 162)",
+ "light": "rgb(229, 126, 236)",
+ "main": "#DF5EE8",
},
"text": Object {
"disabled": "rgba(255, 255, 255, 0.5)",
@@ -436,9 +433,6 @@ exports[` renders correctly 1`] = `
"spacing": Object {
"unit": 8,
},
- "text": Object {
- "secondary": "#FFFFFF",
- },
"transitions": Object {
"create": [Function],
"duration": Object {
diff --git a/game_frontend/src/index.js b/game_frontend/src/index.js
index 6633f8119..58f0f9799 100644
--- a/game_frontend/src/index.js
+++ b/game_frontend/src/index.js
@@ -4,7 +4,7 @@ import { render } from 'react-dom'
import { MuiThemeProvider } from '@material-ui/core/styles'
import { ThemeProvider as StyledComponentsThemeProvider } from 'styled-components'
-import { lightTheme } from 'theme'
+import { darkTheme } from 'theme'
import { Provider } from 'react-redux'
import GamePage from './components/GamePage'
@@ -43,8 +43,8 @@ function getGameIDFromURL () {
const reduxStore = configureStore(initialState)
const RootJSX = () => (
-
-
+
+
diff --git a/game_frontend/src/theme.js b/game_frontend/src/theme.js
index ba59490d1..c5e453d61 100644
--- a/game_frontend/src/theme.js
+++ b/game_frontend/src/theme.js
@@ -2,10 +2,10 @@ import { createMuiTheme } from '@material-ui/core/styles'
const palette = {
primary: {
- main: '#FFFFFF'
+ main: '#606060'
},
secondary: {
- main: '#CFCDC5'
+ main: '#DF5EE8'
}
}
@@ -39,9 +39,6 @@ const theme = {
additionalVariables,
shape,
overrides,
- text: {
- secondary: '#FFFFFF'
- },
typography: {
fontFamily: [
'museo-sans',
diff --git a/version.txt b/version.txt
index 7deb86fee..7486fdbc5 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-0.7.1
\ No newline at end of file
+0.7.2