Merge branch 'master' into develop

2 files changed, 4 insertions, 4 deletions

diff --git a/src/components/services/content/ErrorHandlers/WebviewErrorHandler.js b/src/components/services/content/ErrorHandlers/WebviewErrorHandler.js
index 415a8d1b5..37ccc8e51 100644
--- a/src/components/services/content/ErrorHandlers/WebviewErrorHandler.js
+++ b/src/components/services/content/ErrorHandlers/WebviewErrorHandler.js
@@ -31,7 +31,7 @@ const messages = defineMessages({
   },
 });
 
-export default @injectSheet(styles) @observer class WebviewCrashHandler extends Component {
+export default @injectSheet(styles) @observer class WebviewErrorHandler extends Component {
   static propTypes = {
     name: PropTypes.string.isRequired,
     reload: PropTypes.func.isRequired,
diff --git a/src/components/services/content/ErrorHandlers/styles.js b/src/components/services/content/ErrorHandlers/styles.js
index f11386798..9e2509ee5 100644
--- a/src/components/services/content/ErrorHandlers/styles.js
+++ b/src/components/services/content/ErrorHandlers/styles.js
@@ -1,4 +1,4 @@
-export default {
+export default theme => ({
   component: {
     left: 0,
     position: 'absolute',
@@ -6,7 +6,7 @@ export default {
     width: '100%',
     zIndex: 0,
     alignItems: 'center',
-    // background: $theme-gray-lighter;
+    background: theme.colorWebviewErrorHandlerBackground,
     display: 'flex',
     flexDirection: 'column',
     justifyContent: 'center',
@@ -22,4 +22,4 @@ export default {
       margin: [0, 10, 0, 10],
     },
   },
-};
+});