diff --git a/src/components/landing/landing-layout.tsx b/src/components/landing/landing-layout.tsx index 8dbc7ea2c..513d7c98d 100644 --- a/src/components/landing/landing-layout.tsx +++ b/src/components/landing/landing-layout.tsx @@ -2,7 +2,6 @@ import React from 'react' import { Container } from 'react-bootstrap' import { HeaderBar } from './layout/navigation/header-bar/header-bar' import { Footer } from './layout/footer/footer' -import './layout/style/index.scss' export const LandingLayout: React.FC = ({ children }) => { return ( diff --git a/src/index.tsx b/src/index.tsx index 7c364709f..8ea4525fd 100644 --- a/src/index.tsx +++ b/src/index.tsx @@ -11,6 +11,7 @@ import { Login } from './components/landing/pages/login/login' import { setUpFontAwesome } from './initializers/fontAwesome' import * as serviceWorker from './service-worker' import { store } from './utils/store' +import './style/index.scss' setUpFontAwesome() diff --git a/src/components/landing/layout/style/font-pack.scss b/src/style/font-pack.scss similarity index 100% rename from src/components/landing/layout/style/font-pack.scss rename to src/style/font-pack.scss diff --git a/src/components/landing/layout/style/fonts/SourceCodePro-Black.eot b/src/style/fonts/SourceCodePro-Black.eot similarity index 100% rename from src/components/landing/layout/style/fonts/SourceCodePro-Black.eot rename to src/style/fonts/SourceCodePro-Black.eot diff --git a/src/components/landing/layout/style/fonts/SourceCodePro-Black.ttf b/src/style/fonts/SourceCodePro-Black.ttf similarity index 100% rename from src/components/landing/layout/style/fonts/SourceCodePro-Black.ttf rename to src/style/fonts/SourceCodePro-Black.ttf diff --git a/src/components/landing/layout/style/fonts/SourceCodePro-Black.woff b/src/style/fonts/SourceCodePro-Black.woff similarity index 100% rename from src/components/landing/layout/style/fonts/SourceCodePro-Black.woff rename to src/style/fonts/SourceCodePro-Black.woff diff --git a/src/components/landing/layout/style/fonts/SourceCodePro-Bold.eot b/src/style/fonts/SourceCodePro-Bold.eot similarity index 100% rename from src/components/landing/layout/style/fonts/SourceCodePro-Bold.eot rename to src/style/fonts/SourceCodePro-Bold.eot diff --git a/src/components/landing/layout/style/fonts/SourceCodePro-Bold.ttf b/src/style/fonts/SourceCodePro-Bold.ttf similarity index 100% rename from src/components/landing/layout/style/fonts/SourceCodePro-Bold.ttf rename to src/style/fonts/SourceCodePro-Bold.ttf diff --git a/src/components/landing/layout/style/fonts/SourceCodePro-Bold.woff b/src/style/fonts/SourceCodePro-Bold.woff similarity index 100% rename from src/components/landing/layout/style/fonts/SourceCodePro-Bold.woff rename to src/style/fonts/SourceCodePro-Bold.woff diff --git a/src/components/landing/layout/style/fonts/SourceCodePro-ExtraLight.eot b/src/style/fonts/SourceCodePro-ExtraLight.eot similarity index 100% rename from src/components/landing/layout/style/fonts/SourceCodePro-ExtraLight.eot rename to src/style/fonts/SourceCodePro-ExtraLight.eot diff --git a/src/components/landing/layout/style/fonts/SourceCodePro-ExtraLight.ttf b/src/style/fonts/SourceCodePro-ExtraLight.ttf similarity index 100% rename from src/components/landing/layout/style/fonts/SourceCodePro-ExtraLight.ttf rename to src/style/fonts/SourceCodePro-ExtraLight.ttf diff --git a/src/components/landing/layout/style/fonts/SourceCodePro-ExtraLight.woff b/src/style/fonts/SourceCodePro-ExtraLight.woff similarity index 100% rename from src/components/landing/layout/style/fonts/SourceCodePro-ExtraLight.woff rename to src/style/fonts/SourceCodePro-ExtraLight.woff diff --git a/src/components/landing/layout/style/fonts/SourceCodePro-Light.eot b/src/style/fonts/SourceCodePro-Light.eot similarity index 100% rename from src/components/landing/layout/style/fonts/SourceCodePro-Light.eot rename to src/style/fonts/SourceCodePro-Light.eot diff --git a/src/components/landing/layout/style/fonts/SourceCodePro-Light.ttf b/src/style/fonts/SourceCodePro-Light.ttf similarity index 100% rename from src/components/landing/layout/style/fonts/SourceCodePro-Light.ttf rename to src/style/fonts/SourceCodePro-Light.ttf diff --git a/src/components/landing/layout/style/fonts/SourceCodePro-Light.woff b/src/style/fonts/SourceCodePro-Light.woff similarity index 100% rename from src/components/landing/layout/style/fonts/SourceCodePro-Light.woff rename to src/style/fonts/SourceCodePro-Light.woff diff --git a/src/components/landing/layout/style/fonts/SourceCodePro-Medium.eot b/src/style/fonts/SourceCodePro-Medium.eot similarity index 100% rename from src/components/landing/layout/style/fonts/SourceCodePro-Medium.eot rename to src/style/fonts/SourceCodePro-Medium.eot diff --git a/src/components/landing/layout/style/fonts/SourceCodePro-Medium.ttf b/src/style/fonts/SourceCodePro-Medium.ttf similarity index 100% rename from src/components/landing/layout/style/fonts/SourceCodePro-Medium.ttf rename to src/style/fonts/SourceCodePro-Medium.ttf diff --git a/src/components/landing/layout/style/fonts/SourceCodePro-Medium.woff b/src/style/fonts/SourceCodePro-Medium.woff similarity index 100% rename from src/components/landing/layout/style/fonts/SourceCodePro-Medium.woff rename to src/style/fonts/SourceCodePro-Medium.woff diff --git a/src/components/landing/layout/style/fonts/SourceCodePro-Regular.eot b/src/style/fonts/SourceCodePro-Regular.eot similarity index 100% rename from src/components/landing/layout/style/fonts/SourceCodePro-Regular.eot rename to src/style/fonts/SourceCodePro-Regular.eot diff --git a/src/components/landing/layout/style/fonts/SourceCodePro-Regular.ttf b/src/style/fonts/SourceCodePro-Regular.ttf similarity index 100% rename from src/components/landing/layout/style/fonts/SourceCodePro-Regular.ttf rename to src/style/fonts/SourceCodePro-Regular.ttf diff --git a/src/components/landing/layout/style/fonts/SourceCodePro-Regular.woff b/src/style/fonts/SourceCodePro-Regular.woff similarity index 100% rename from src/components/landing/layout/style/fonts/SourceCodePro-Regular.woff rename to src/style/fonts/SourceCodePro-Regular.woff diff --git a/src/components/landing/layout/style/fonts/SourceCodePro-Semibold.eot b/src/style/fonts/SourceCodePro-Semibold.eot similarity index 100% rename from src/components/landing/layout/style/fonts/SourceCodePro-Semibold.eot rename to src/style/fonts/SourceCodePro-Semibold.eot diff --git a/src/components/landing/layout/style/fonts/SourceCodePro-Semibold.ttf b/src/style/fonts/SourceCodePro-Semibold.ttf similarity index 100% rename from src/components/landing/layout/style/fonts/SourceCodePro-Semibold.ttf rename to src/style/fonts/SourceCodePro-Semibold.ttf diff --git a/src/components/landing/layout/style/fonts/SourceCodePro-Semibold.woff b/src/style/fonts/SourceCodePro-Semibold.woff similarity index 100% rename from src/components/landing/layout/style/fonts/SourceCodePro-Semibold.woff rename to src/style/fonts/SourceCodePro-Semibold.woff diff --git a/src/components/landing/layout/style/fonts/SourceSansPro-Black.eot b/src/style/fonts/SourceSansPro-Black.eot similarity index 100% rename from src/components/landing/layout/style/fonts/SourceSansPro-Black.eot rename to src/style/fonts/SourceSansPro-Black.eot diff --git a/src/components/landing/layout/style/fonts/SourceSansPro-Black.ttf b/src/style/fonts/SourceSansPro-Black.ttf similarity index 100% rename from src/components/landing/layout/style/fonts/SourceSansPro-Black.ttf rename to src/style/fonts/SourceSansPro-Black.ttf diff --git a/src/components/landing/layout/style/fonts/SourceSansPro-Black.woff b/src/style/fonts/SourceSansPro-Black.woff similarity index 100% rename from src/components/landing/layout/style/fonts/SourceSansPro-Black.woff rename to src/style/fonts/SourceSansPro-Black.woff diff --git a/src/components/landing/layout/style/fonts/SourceSansPro-BlackItalic.eot b/src/style/fonts/SourceSansPro-BlackItalic.eot similarity index 100% rename from src/components/landing/layout/style/fonts/SourceSansPro-BlackItalic.eot rename to src/style/fonts/SourceSansPro-BlackItalic.eot diff --git a/src/components/landing/layout/style/fonts/SourceSansPro-BlackItalic.ttf b/src/style/fonts/SourceSansPro-BlackItalic.ttf similarity index 100% rename from src/components/landing/layout/style/fonts/SourceSansPro-BlackItalic.ttf rename to src/style/fonts/SourceSansPro-BlackItalic.ttf diff --git a/src/components/landing/layout/style/fonts/SourceSansPro-BlackItalic.woff b/src/style/fonts/SourceSansPro-BlackItalic.woff similarity index 100% rename from src/components/landing/layout/style/fonts/SourceSansPro-BlackItalic.woff rename to src/style/fonts/SourceSansPro-BlackItalic.woff diff --git a/src/components/landing/layout/style/fonts/SourceSansPro-Bold.eot b/src/style/fonts/SourceSansPro-Bold.eot similarity index 100% rename from src/components/landing/layout/style/fonts/SourceSansPro-Bold.eot rename to src/style/fonts/SourceSansPro-Bold.eot diff --git a/src/components/landing/layout/style/fonts/SourceSansPro-Bold.ttf b/src/style/fonts/SourceSansPro-Bold.ttf similarity index 100% rename from src/components/landing/layout/style/fonts/SourceSansPro-Bold.ttf rename to src/style/fonts/SourceSansPro-Bold.ttf diff --git a/src/components/landing/layout/style/fonts/SourceSansPro-Bold.woff b/src/style/fonts/SourceSansPro-Bold.woff similarity index 100% rename from src/components/landing/layout/style/fonts/SourceSansPro-Bold.woff rename to src/style/fonts/SourceSansPro-Bold.woff diff --git a/src/components/landing/layout/style/fonts/SourceSansPro-BoldItalic.eot b/src/style/fonts/SourceSansPro-BoldItalic.eot similarity index 100% rename from src/components/landing/layout/style/fonts/SourceSansPro-BoldItalic.eot rename to src/style/fonts/SourceSansPro-BoldItalic.eot diff --git a/src/components/landing/layout/style/fonts/SourceSansPro-BoldItalic.ttf b/src/style/fonts/SourceSansPro-BoldItalic.ttf similarity index 100% rename from src/components/landing/layout/style/fonts/SourceSansPro-BoldItalic.ttf rename to src/style/fonts/SourceSansPro-BoldItalic.ttf diff --git a/src/components/landing/layout/style/fonts/SourceSansPro-BoldItalic.woff b/src/style/fonts/SourceSansPro-BoldItalic.woff similarity index 100% rename from src/components/landing/layout/style/fonts/SourceSansPro-BoldItalic.woff rename to src/style/fonts/SourceSansPro-BoldItalic.woff diff --git a/src/components/landing/layout/style/fonts/SourceSansPro-ExtraLight.eot b/src/style/fonts/SourceSansPro-ExtraLight.eot similarity index 100% rename from src/components/landing/layout/style/fonts/SourceSansPro-ExtraLight.eot rename to src/style/fonts/SourceSansPro-ExtraLight.eot diff --git a/src/components/landing/layout/style/fonts/SourceSansPro-ExtraLight.ttf b/src/style/fonts/SourceSansPro-ExtraLight.ttf similarity index 100% rename from src/components/landing/layout/style/fonts/SourceSansPro-ExtraLight.ttf rename to src/style/fonts/SourceSansPro-ExtraLight.ttf diff --git a/src/components/landing/layout/style/fonts/SourceSansPro-ExtraLight.woff b/src/style/fonts/SourceSansPro-ExtraLight.woff similarity index 100% rename from src/components/landing/layout/style/fonts/SourceSansPro-ExtraLight.woff rename to src/style/fonts/SourceSansPro-ExtraLight.woff diff --git a/src/components/landing/layout/style/fonts/SourceSansPro-ExtraLightItalic.eot b/src/style/fonts/SourceSansPro-ExtraLightItalic.eot similarity index 100% rename from src/components/landing/layout/style/fonts/SourceSansPro-ExtraLightItalic.eot rename to src/style/fonts/SourceSansPro-ExtraLightItalic.eot diff --git a/src/components/landing/layout/style/fonts/SourceSansPro-ExtraLightItalic.ttf b/src/style/fonts/SourceSansPro-ExtraLightItalic.ttf similarity index 100% rename from src/components/landing/layout/style/fonts/SourceSansPro-ExtraLightItalic.ttf rename to src/style/fonts/SourceSansPro-ExtraLightItalic.ttf diff --git a/src/components/landing/layout/style/fonts/SourceSansPro-ExtraLightItalic.woff b/src/style/fonts/SourceSansPro-ExtraLightItalic.woff similarity index 100% rename from src/components/landing/layout/style/fonts/SourceSansPro-ExtraLightItalic.woff rename to src/style/fonts/SourceSansPro-ExtraLightItalic.woff diff --git a/src/components/landing/layout/style/fonts/SourceSansPro-Italic.eot b/src/style/fonts/SourceSansPro-Italic.eot similarity index 100% rename from src/components/landing/layout/style/fonts/SourceSansPro-Italic.eot rename to src/style/fonts/SourceSansPro-Italic.eot diff --git a/src/components/landing/layout/style/fonts/SourceSansPro-Italic.ttf b/src/style/fonts/SourceSansPro-Italic.ttf similarity index 100% rename from src/components/landing/layout/style/fonts/SourceSansPro-Italic.ttf rename to src/style/fonts/SourceSansPro-Italic.ttf diff --git a/src/components/landing/layout/style/fonts/SourceSansPro-Italic.woff b/src/style/fonts/SourceSansPro-Italic.woff similarity index 100% rename from src/components/landing/layout/style/fonts/SourceSansPro-Italic.woff rename to src/style/fonts/SourceSansPro-Italic.woff diff --git a/src/components/landing/layout/style/fonts/SourceSansPro-Light.eot b/src/style/fonts/SourceSansPro-Light.eot similarity index 100% rename from src/components/landing/layout/style/fonts/SourceSansPro-Light.eot rename to src/style/fonts/SourceSansPro-Light.eot diff --git a/src/components/landing/layout/style/fonts/SourceSansPro-Light.ttf b/src/style/fonts/SourceSansPro-Light.ttf similarity index 100% rename from src/components/landing/layout/style/fonts/SourceSansPro-Light.ttf rename to src/style/fonts/SourceSansPro-Light.ttf diff --git a/src/components/landing/layout/style/fonts/SourceSansPro-Light.woff b/src/style/fonts/SourceSansPro-Light.woff similarity index 100% rename from src/components/landing/layout/style/fonts/SourceSansPro-Light.woff rename to src/style/fonts/SourceSansPro-Light.woff diff --git a/src/components/landing/layout/style/fonts/SourceSansPro-LightItalic.eot b/src/style/fonts/SourceSansPro-LightItalic.eot similarity index 100% rename from src/components/landing/layout/style/fonts/SourceSansPro-LightItalic.eot rename to src/style/fonts/SourceSansPro-LightItalic.eot diff --git a/src/components/landing/layout/style/fonts/SourceSansPro-LightItalic.ttf b/src/style/fonts/SourceSansPro-LightItalic.ttf similarity index 100% rename from src/components/landing/layout/style/fonts/SourceSansPro-LightItalic.ttf rename to src/style/fonts/SourceSansPro-LightItalic.ttf diff --git a/src/components/landing/layout/style/fonts/SourceSansPro-LightItalic.woff b/src/style/fonts/SourceSansPro-LightItalic.woff similarity index 100% rename from src/components/landing/layout/style/fonts/SourceSansPro-LightItalic.woff rename to src/style/fonts/SourceSansPro-LightItalic.woff diff --git a/src/components/landing/layout/style/fonts/SourceSansPro-Regular.eot b/src/style/fonts/SourceSansPro-Regular.eot similarity index 100% rename from src/components/landing/layout/style/fonts/SourceSansPro-Regular.eot rename to src/style/fonts/SourceSansPro-Regular.eot diff --git a/src/components/landing/layout/style/fonts/SourceSansPro-Regular.ttf b/src/style/fonts/SourceSansPro-Regular.ttf similarity index 100% rename from src/components/landing/layout/style/fonts/SourceSansPro-Regular.ttf rename to src/style/fonts/SourceSansPro-Regular.ttf diff --git a/src/components/landing/layout/style/fonts/SourceSansPro-Regular.woff b/src/style/fonts/SourceSansPro-Regular.woff similarity index 100% rename from src/components/landing/layout/style/fonts/SourceSansPro-Regular.woff rename to src/style/fonts/SourceSansPro-Regular.woff diff --git a/src/components/landing/layout/style/fonts/SourceSansPro-Semibold.eot b/src/style/fonts/SourceSansPro-Semibold.eot similarity index 100% rename from src/components/landing/layout/style/fonts/SourceSansPro-Semibold.eot rename to src/style/fonts/SourceSansPro-Semibold.eot diff --git a/src/components/landing/layout/style/fonts/SourceSansPro-Semibold.ttf b/src/style/fonts/SourceSansPro-Semibold.ttf similarity index 100% rename from src/components/landing/layout/style/fonts/SourceSansPro-Semibold.ttf rename to src/style/fonts/SourceSansPro-Semibold.ttf diff --git a/src/components/landing/layout/style/fonts/SourceSansPro-Semibold.woff b/src/style/fonts/SourceSansPro-Semibold.woff similarity index 100% rename from src/components/landing/layout/style/fonts/SourceSansPro-Semibold.woff rename to src/style/fonts/SourceSansPro-Semibold.woff diff --git a/src/components/landing/layout/style/fonts/SourceSansPro-SemiboldItalic.eot b/src/style/fonts/SourceSansPro-SemiboldItalic.eot similarity index 100% rename from src/components/landing/layout/style/fonts/SourceSansPro-SemiboldItalic.eot rename to src/style/fonts/SourceSansPro-SemiboldItalic.eot diff --git a/src/components/landing/layout/style/fonts/SourceSansPro-SemiboldItalic.ttf b/src/style/fonts/SourceSansPro-SemiboldItalic.ttf similarity index 100% rename from src/components/landing/layout/style/fonts/SourceSansPro-SemiboldItalic.ttf rename to src/style/fonts/SourceSansPro-SemiboldItalic.ttf diff --git a/src/components/landing/layout/style/fonts/SourceSansPro-SemiboldItalic.woff b/src/style/fonts/SourceSansPro-SemiboldItalic.woff similarity index 100% rename from src/components/landing/layout/style/fonts/SourceSansPro-SemiboldItalic.woff rename to src/style/fonts/SourceSansPro-SemiboldItalic.woff diff --git a/src/components/landing/layout/style/fonts/SourceSerifPro-Bold.eot b/src/style/fonts/SourceSerifPro-Bold.eot similarity index 100% rename from src/components/landing/layout/style/fonts/SourceSerifPro-Bold.eot rename to src/style/fonts/SourceSerifPro-Bold.eot diff --git a/src/components/landing/layout/style/fonts/SourceSerifPro-Bold.ttf b/src/style/fonts/SourceSerifPro-Bold.ttf similarity index 100% rename from src/components/landing/layout/style/fonts/SourceSerifPro-Bold.ttf rename to src/style/fonts/SourceSerifPro-Bold.ttf diff --git a/src/components/landing/layout/style/fonts/SourceSerifPro-Bold.woff b/src/style/fonts/SourceSerifPro-Bold.woff similarity index 100% rename from src/components/landing/layout/style/fonts/SourceSerifPro-Bold.woff rename to src/style/fonts/SourceSerifPro-Bold.woff diff --git a/src/components/landing/layout/style/fonts/SourceSerifPro-Regular.eot b/src/style/fonts/SourceSerifPro-Regular.eot similarity index 100% rename from src/components/landing/layout/style/fonts/SourceSerifPro-Regular.eot rename to src/style/fonts/SourceSerifPro-Regular.eot diff --git a/src/components/landing/layout/style/fonts/SourceSerifPro-Regular.ttf b/src/style/fonts/SourceSerifPro-Regular.ttf similarity index 100% rename from src/components/landing/layout/style/fonts/SourceSerifPro-Regular.ttf rename to src/style/fonts/SourceSerifPro-Regular.ttf diff --git a/src/components/landing/layout/style/fonts/SourceSerifPro-Regular.woff b/src/style/fonts/SourceSerifPro-Regular.woff similarity index 100% rename from src/components/landing/layout/style/fonts/SourceSerifPro-Regular.woff rename to src/style/fonts/SourceSerifPro-Regular.woff diff --git a/src/components/landing/layout/style/fonts/SourceSerifPro-Semibold.eot b/src/style/fonts/SourceSerifPro-Semibold.eot similarity index 100% rename from src/components/landing/layout/style/fonts/SourceSerifPro-Semibold.eot rename to src/style/fonts/SourceSerifPro-Semibold.eot diff --git a/src/components/landing/layout/style/fonts/SourceSerifPro-Semibold.ttf b/src/style/fonts/SourceSerifPro-Semibold.ttf similarity index 100% rename from src/components/landing/layout/style/fonts/SourceSerifPro-Semibold.ttf rename to src/style/fonts/SourceSerifPro-Semibold.ttf diff --git a/src/components/landing/layout/style/fonts/SourceSerifPro-Semibold.woff b/src/style/fonts/SourceSerifPro-Semibold.woff similarity index 100% rename from src/components/landing/layout/style/fonts/SourceSerifPro-Semibold.woff rename to src/style/fonts/SourceSerifPro-Semibold.woff diff --git a/src/components/landing/layout/style/index.scss b/src/style/index.scss similarity index 61% rename from src/components/landing/layout/style/index.scss rename to src/style/index.scss index f5aeeb8fb..6cfc076cd 100644 --- a/src/components/landing/layout/style/index.scss +++ b/src/style/index.scss @@ -1,5 +1,5 @@ -@import "../../../../../node_modules/bootstrap/scss/bootstrap"; -@import '../../../../../node_modules/react-bootstrap-typeahead/css/Typeahead'; +@import "../../node_modules/bootstrap/scss/bootstrap"; +@import '../../node_modules/react-bootstrap-typeahead/css/Typeahead'; @import "font-pack"; html {