Update where spinner occurs

components/Carbon.js

@@ -4,8 +4,9 @@ import * as hljs from 'highlight.js'
 import debounce from 'lodash.debounce'
 import ms from 'ms'
 import { Controlled as CodeMirror } from 'react-codemirror2'
+import SpinnerWrapper from './SpinnerWrapper'
 
-import WindowControls from '../components/WindowControls'
+import WindowControls from './WindowControls'
 import {
   COLORS,
   LANGUAGE_MODE_HASH,
@@ -14,7 +15,7 @@ import {
   DEFAULT_SETTINGS
 } from '../lib/constants'
 
-const Watermark = dynamic(() => import('../components/svg/Watermark'), {
+const Watermark = dynamic(() => import('./svg/Watermark'), {
   loading: () => null
 })
 
@@ -223,7 +224,7 @@ class Carbon extends React.PureComponent {
     return (
       <div className="section">
         <div className="export-container" ref={this.props.innerRef} id="export-container">
-          {content}
+          <SpinnerWrapper>{content}</SpinnerWrapper>
           <div className="twitter-png-fix" />
         </div>
         <style jsx>

components/Editor.js

@@ -14,7 +14,6 @@ import Carbon from './Carbon'
 import ExportMenu from './ExportMenu'
 import Themes from './Themes'
 import TweetButton from './TweetButton'
-import SpinnerWrapper from './SpinnerWrapper'
 import {
   LANGUAGES,
   LANGUAGE_MIME_HASH,
@@ -285,7 +284,7 @@ class Editor extends React.Component {
     const config = omit(this.state, ['code', 'aspectRatio', 'titleBar'])
 
     return (
-      <SpinnerWrapper>
+      <>
         <div className="editor">
           <Toolbar>
             <Themes key={theme} updateTheme={this.updateTheme} theme={theme} />
@@ -363,7 +362,7 @@ class Editor extends React.Component {
             }
           `}
         </style>
-      </SpinnerWrapper>
+      </>
     )
   }
 }

components/SpinnerWrapper.js

@@ -15,7 +15,8 @@ export default function SpinnerWrapper(props) {
         <style jsx>
           {`
             div {
-              height: 160px;
+              width: 876px;
+              height: 240px;
             }
           `}
         </style>