diff --git a/package.json b/package.json index a4cd5cf8..e97b366a 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,7 @@ "scripts": { "start": "yarn build:watch", "build": "yarn build:tsc && yarn build:dist", - "build:tsc": "tsc -m es6 --outDir dist && cp -R ./fonts/ ./dist/fonts/ && mkdir -p ./dist && mkdir -p ./dist/components/modal && cp ./styles.scss ./dist/styles.scss && cp ./src/components/modal/styles.scss ./dist/components/modal/styles.scss", + "build:tsc": "tsc -m es6 --outDir dist && cp -R ./src/fonts/ ./dist/fonts/ && mkdir -p ./dist && mkdir -p ./dist/components/modal && cp ./src/provider/styles.scss ./dist/provider/styles.scss && cp ./src/components/modal/styles.scss ./dist/components/modal/styles.scss", "build:dist": "cross-env NODE_ENV=production webpack", "build:watch": "tsc -w", "lint": "eslint src/**/*.{ts,tsx} stories/**/*.tsx --fix", diff --git a/fonts/Ezra-Bold.otf b/src/fonts/Ezra-Bold.otf similarity index 100% rename from fonts/Ezra-Bold.otf rename to src/fonts/Ezra-Bold.otf diff --git a/fonts/Ezra-BoldItalic.otf b/src/fonts/Ezra-BoldItalic.otf similarity index 100% rename from fonts/Ezra-BoldItalic.otf rename to src/fonts/Ezra-BoldItalic.otf diff --git a/fonts/Ezra-Italic.otf b/src/fonts/Ezra-Italic.otf similarity index 100% rename from fonts/Ezra-Italic.otf rename to src/fonts/Ezra-Italic.otf diff --git a/fonts/Ezra-Light.otf b/src/fonts/Ezra-Light.otf similarity index 100% rename from fonts/Ezra-Light.otf rename to src/fonts/Ezra-Light.otf diff --git a/fonts/Ezra-Medium.otf b/src/fonts/Ezra-Medium.otf similarity index 100% rename from fonts/Ezra-Medium.otf rename to src/fonts/Ezra-Medium.otf diff --git a/fonts/Ezra-MediumItalic.otf b/src/fonts/Ezra-MediumItalic.otf similarity index 100% rename from fonts/Ezra-MediumItalic.otf rename to src/fonts/Ezra-MediumItalic.otf diff --git a/fonts/Inter-Bold.ttf b/src/fonts/Inter-Bold.ttf similarity index 100% rename from fonts/Inter-Bold.ttf rename to src/fonts/Inter-Bold.ttf diff --git a/fonts/Inter-ExtraBold.ttf b/src/fonts/Inter-ExtraBold.ttf similarity index 100% rename from fonts/Inter-ExtraBold.ttf rename to src/fonts/Inter-ExtraBold.ttf diff --git a/fonts/Inter-Light.ttf b/src/fonts/Inter-Light.ttf similarity index 100% rename from fonts/Inter-Light.ttf rename to src/fonts/Inter-Light.ttf diff --git a/fonts/Inter-Medium.ttf b/src/fonts/Inter-Medium.ttf similarity index 100% rename from fonts/Inter-Medium.ttf rename to src/fonts/Inter-Medium.ttf diff --git a/fonts/Inter-Regular.ttf b/src/fonts/Inter-Regular.ttf similarity index 100% rename from fonts/Inter-Regular.ttf rename to src/fonts/Inter-Regular.ttf diff --git a/fonts/Inter-SemiBold.ttf b/src/fonts/Inter-SemiBold.ttf similarity index 100% rename from fonts/Inter-SemiBold.ttf rename to src/fonts/Inter-SemiBold.ttf diff --git a/fonts/proximanova-bold-webfont.woff b/src/fonts/proximanova-bold-webfont.woff similarity index 100% rename from fonts/proximanova-bold-webfont.woff rename to src/fonts/proximanova-bold-webfont.woff diff --git a/fonts/proximanova-bold-webfont.woff2 b/src/fonts/proximanova-bold-webfont.woff2 similarity index 100% rename from fonts/proximanova-bold-webfont.woff2 rename to src/fonts/proximanova-bold-webfont.woff2 diff --git a/src/provider/masa-provider.tsx b/src/provider/masa-provider.tsx index 33a6d195..8ea058db 100644 --- a/src/provider/masa-provider.tsx +++ b/src/provider/masa-provider.tsx @@ -7,7 +7,7 @@ import { QueryClientProvider } from 'react-query'; import { queryClient } from './masa-query-client'; -import '../../styles.scss'; +import './styles.scss'; import { MasaInterface } from '../components'; export const MasaProvider = ({ diff --git a/styles.scss b/src/provider/styles.scss similarity index 75% rename from styles.scss rename to src/provider/styles.scss index d2ec61d3..d380ac89 100644 --- a/styles.scss +++ b/src/provider/styles.scss @@ -1,13 +1,13 @@ @font-face { font-family: 'Proxima Nova'; font-weight: 500; - src: url('./fonts/proximanova-bold-webfont.woff') format('woff'); - src: url('./fonts/proximanova-bold-webfont.woff2') format('woff2'); + src: url('../fonts/proximanova-bold-webfont.woff') format('woff'); + src: url('../fonts/proximanova-bold-webfont.woff2') format('woff2'); } @font-face { font-family: 'Ezra'; - src: url('./fonts/Ezra-Light.otf'); + src: url('../fonts/Ezra-Light.otf'); font-weight: 400; font-style: normal; @@ -15,7 +15,7 @@ @font-face { font-family: 'Ezra'; - src: url('./fonts/Ezra-Bold.otf'); + src: url('../fonts/Ezra-Bold.otf'); font-weight: 700; font-style: bold; @@ -23,7 +23,7 @@ @font-face { font-family: 'Ezra'; - src: url('./fonts/Ezra-Medium.otf'); + src: url('../fonts/Ezra-Medium.otf'); font-weight: 500; font-style: Medium; @@ -31,14 +31,14 @@ @font-face { font-family: 'Ezra'; - src: url('./fonts/Ezra-Italic.otf'); + src: url('../fonts/Ezra-Italic.otf'); font-style: italic; } @font-face { font-family: 'Inter'; - src: url('./fonts/Inter-Light.ttf'); + src: url('../fonts/Inter-Light.ttf'); font-weight: 400; font-style: normal; @@ -46,7 +46,7 @@ @font-face { font-family: 'Inter'; - src: url('./fonts/Inter-Bold.ttf'); + src: url('../fonts/Inter-Bold.ttf'); font-weight: 700; font-style: bold; @@ -54,7 +54,7 @@ @font-face { font-family: 'Inter'; - src: url('./fonts/Inter-Medium.ttf'); + src: url('../fonts/Inter-Medium.ttf'); font-weight: 500; }