|
@@ -1,6 +1,5 @@
|
|
|
import $ from 'jquery';
|
|
|
import {RouteComponentProps} from 'react-router/lib/Router';
|
|
|
-import {ThemeProvider} from 'emotion-theming';
|
|
|
import {browserHistory} from 'react-router';
|
|
|
import Cookies from 'js-cookie';
|
|
|
import PropTypes from 'prop-types';
|
|
@@ -20,14 +19,12 @@ import AlertActions from 'app/actions/alertActions';
|
|
|
import ConfigStore from 'app/stores/configStore';
|
|
|
import ErrorBoundary from 'app/components/errorBoundary';
|
|
|
import GlobalModal from 'app/components/globalModal';
|
|
|
-import GlobalStyles from 'app/styles/global';
|
|
|
import HookStore from 'app/stores/hookStore';
|
|
|
import Indicators from 'app/components/indicators';
|
|
|
import LoadingIndicator from 'app/components/loadingIndicator';
|
|
|
import NewsletterConsent from 'app/views/newsletterConsent';
|
|
|
import OrganizationsStore from 'app/stores/organizationsStore';
|
|
|
import getRouteStringFromRoutes from 'app/utils/getRouteStringFromRoutes';
|
|
|
-import theme from 'app/utils/theme';
|
|
|
import withApi from 'app/utils/withApi';
|
|
|
import withConfig from 'app/utils/withConfig';
|
|
|
|
|
@@ -259,15 +256,12 @@ class App extends React.Component<Props, State> {
|
|
|
}
|
|
|
|
|
|
return (
|
|
|
- <ThemeProvider theme={theme}>
|
|
|
- <GlobalStyles theme={theme} />
|
|
|
- <div className="main-container" tabIndex={-1} ref={this.mainContainerRef}>
|
|
|
- <GlobalModal onClose={this.handleGlobalModalClose} />
|
|
|
- <SystemAlerts className="messages-container" />
|
|
|
- <Indicators className="indicators-container" />
|
|
|
- <ErrorBoundary>{this.renderBody()}</ErrorBoundary>
|
|
|
- </div>
|
|
|
- </ThemeProvider>
|
|
|
+ <div className="main-container" tabIndex={-1} ref={this.mainContainerRef}>
|
|
|
+ <GlobalModal onClose={this.handleGlobalModalClose} />
|
|
|
+ <SystemAlerts className="messages-container" />
|
|
|
+ <Indicators className="indicators-container" />
|
|
|
+ <ErrorBoundary>{this.renderBody()}</ErrorBoundary>
|
|
|
+ </div>
|
|
|
);
|
|
|
}
|
|
|
}
|