From 0ac5ac1d5766f1163e24f4cb88cd0a34663cd474 Mon Sep 17 00:00:00 2001 From: Jack Reed <phillipjreed@gmail.com> Date: Wed, 13 Mar 2019 15:19:08 -0600 Subject: [PATCH] Move require of scss to the top level component --- jest.json | 2 +- src/components/App.js | 1 + src/init.js | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jest.json b/jest.json index 9aed4d910..d63514098 100644 --- a/jest.json +++ b/jest.json @@ -8,7 +8,7 @@ "coverageDirectory": "<rootDir>/coverage", "coverageReporters": ["html", "lcov"], "moduleNameMapper": { - "\\.css$": "<rootDir>/__mocks__/css.js" + "\\.s?css$": "<rootDir>/__mocks__/css.js" }, "setupFiles": [ "<rootDir>/setupJest.js" diff --git a/src/components/App.js b/src/components/App.js index 8e2d936dd..37891710b 100644 --- a/src/components/App.js +++ b/src/components/App.js @@ -5,6 +5,7 @@ import Fullscreen from 'react-full-screen'; import { I18nextProvider } from 'react-i18next'; import i18n from '../i18n'; import WorkspaceArea from '../containers/WorkspaceArea'; +import '../styles/index.scss'; /** * This is the top level Mirador component. diff --git a/src/init.js b/src/init.js index eac97062d..30ccb0096 100644 --- a/src/init.js +++ b/src/init.js @@ -1,5 +1,4 @@ import MiradorViewer from './lib/MiradorViewer'; -import './styles/index.scss'; /** * Default Mirador instantiation -- GitLab