Skip to content

Commit

Permalink
Moving stuff around
Browse files Browse the repository at this point in the history
  • Loading branch information
hide-on-bush-x committed Feb 27, 2023
1 parent cb5a340 commit 6fe2054
Show file tree
Hide file tree
Showing 17 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion package.json
Expand Up @@ -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",
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion src/provider/masa-provider.tsx
Expand Up @@ -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 = ({
Expand Down
18 changes: 9 additions & 9 deletions styles.scss → src/provider/styles.scss
@@ -1,60 +1,60 @@
@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;
}

@font-face {
font-family: 'Ezra';
src: url('./fonts/Ezra-Bold.otf');
src: url('../fonts/Ezra-Bold.otf');

font-weight: 700;
font-style: bold;
}

@font-face {
font-family: 'Ezra';
src: url('./fonts/Ezra-Medium.otf');
src: url('../fonts/Ezra-Medium.otf');

font-weight: 500;
font-style: Medium;
}

@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;
}

@font-face {
font-family: 'Inter';
src: url('./fonts/Inter-Bold.ttf');
src: url('../fonts/Inter-Bold.ttf');

font-weight: 700;
font-style: bold;
}

@font-face {
font-family: 'Inter';
src: url('./fonts/Inter-Medium.ttf');
src: url('../fonts/Inter-Medium.ttf');

font-weight: 500;
}
Expand Down

0 comments on commit 6fe2054

Please sign in to comment.