diff --git a/src/App/App.tsx b/src/App/App.tsx index f1843a6..e19329a 100644 --- a/src/App/App.tsx +++ b/src/App/App.tsx @@ -1,7 +1,5 @@ import React, { Component, ReactElement } from 'react'; import isNil from 'lodash/isNil'; -import 'normalize.css'; -import 'typeface-roboto/index.css'; import storage from '../utils/storage'; import { makeLogin, isTokenExpire } from '../utils/login'; @@ -10,8 +8,8 @@ import LoginModal from '../components/Login'; import Header from '../components/Header'; import { Container, Content } from '../components/Layout'; import API from '../utils/api'; -import '../utils/styles/global'; import Footer from '../components/Footer'; +import StyleBaseline from '../design-tokens/StyleBaseline'; import AppRoute from './AppRoute'; import { AppProps, AppContextProvider } from './AppContext'; @@ -46,10 +44,13 @@ export default class App extends Component<{}, AppProps> { const context = { isUserLoggedIn, packages, logoUrl, user, scope }; return ( - - {isLoading ? : {this.renderContent()}} - {this.renderLoginModal()} - + <> + + + {isLoading ? : {this.renderContent()}} + {this.renderLoginModal()} + + ); } diff --git a/src/components/Footer/__snapshots__/Footer.test.tsx.snap b/src/components/Footer/__snapshots__/Footer.test.tsx.snap index aa1ccfc..d0b2e36 100644 --- a/src/components/Footer/__snapshots__/Footer.test.tsx.snap +++ b/src/components/Footer/__snapshots__/Footer.test.tsx.snap @@ -1,3 +1,3 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`