diff --git a/Components/Layout/Auth.jsx b/Components/Layout/Auth.jsx index a9d942f..5f2755b 100644 --- a/Components/Layout/Auth.jsx +++ b/Components/Layout/Auth.jsx @@ -10,7 +10,7 @@ const UserText = styled.span` text-transform: uppercase; color: #fff; font-size: 0.5rem; - font-family: 'Montserrat', sans-serif; + font-family: 'Montserrat'; font-weight: 500; ${min('laptop')} { @@ -30,7 +30,7 @@ const Logout = styled.a` text-transform: uppercase; color: #fff; font-size: 0.45rem; - font-family: 'Montserrat', sans-serif; + font-family: 'Montserrat'; font-weight: 500; ${min('laptop')} { diff --git a/Components/Layout/Logo.jsx b/Components/Layout/Logo.jsx index 4dca148..2310739 100644 --- a/Components/Layout/Logo.jsx +++ b/Components/Layout/Logo.jsx @@ -16,7 +16,7 @@ const LogoText = styled.h3` text-transform: uppercase; color: #fff; font-size: 0.85rem; - font-family: 'Montserrat', sans-serif; + font-family: 'Montserrat'; font-weight: 500; ${min('laptop')} { font-size: 1.2rem; diff --git a/package.json b/package.json index 3de2508..c96578c 100644 --- a/package.json +++ b/package.json @@ -17,6 +17,7 @@ "dependencies": { "@ant-design/icons": "^4.7.0", "@apollo/client": "^3.6.0", + "@fontsource/montserrat": "^4.5.12", "antd": "^4.21.3", "axios": "^0.26.1", "dayjs": "^1.11.2", diff --git a/public/fonts/Montserrat/Montserrat-Black.ttf b/public/fonts/Montserrat/Montserrat-Black.ttf deleted file mode 100644 index 7bb6575..0000000 Binary files a/public/fonts/Montserrat/Montserrat-Black.ttf and /dev/null differ diff --git a/public/fonts/Montserrat/Montserrat-BlackItalic.ttf b/public/fonts/Montserrat/Montserrat-BlackItalic.ttf deleted file mode 100644 index 172e249..0000000 Binary files a/public/fonts/Montserrat/Montserrat-BlackItalic.ttf and /dev/null differ diff --git a/public/fonts/Montserrat/Montserrat-Bold.ttf b/public/fonts/Montserrat/Montserrat-Bold.ttf deleted file mode 100644 index efddc83..0000000 Binary files a/public/fonts/Montserrat/Montserrat-Bold.ttf and /dev/null differ diff --git a/public/fonts/Montserrat/Montserrat-BoldItalic.ttf b/public/fonts/Montserrat/Montserrat-BoldItalic.ttf deleted file mode 100644 index b7d8031..0000000 Binary files a/public/fonts/Montserrat/Montserrat-BoldItalic.ttf and /dev/null differ diff --git a/public/fonts/Montserrat/Montserrat-ExtraBold.ttf b/public/fonts/Montserrat/Montserrat-ExtraBold.ttf deleted file mode 100644 index 3059507..0000000 Binary files a/public/fonts/Montserrat/Montserrat-ExtraBold.ttf and /dev/null differ diff --git a/public/fonts/Montserrat/Montserrat-ExtraBoldItalic.ttf b/public/fonts/Montserrat/Montserrat-ExtraBoldItalic.ttf deleted file mode 100644 index c21a396..0000000 Binary files a/public/fonts/Montserrat/Montserrat-ExtraBoldItalic.ttf and /dev/null differ diff --git a/public/fonts/Montserrat/Montserrat-ExtraLight.ttf b/public/fonts/Montserrat/Montserrat-ExtraLight.ttf deleted file mode 100644 index f1b405e..0000000 Binary files a/public/fonts/Montserrat/Montserrat-ExtraLight.ttf and /dev/null differ diff --git a/public/fonts/Montserrat/Montserrat-ExtraLightItalic.ttf b/public/fonts/Montserrat/Montserrat-ExtraLightItalic.ttf deleted file mode 100644 index 382293d..0000000 Binary files a/public/fonts/Montserrat/Montserrat-ExtraLightItalic.ttf and /dev/null differ diff --git a/public/fonts/Montserrat/Montserrat-Italic.ttf b/public/fonts/Montserrat/Montserrat-Italic.ttf deleted file mode 100644 index eee45ba..0000000 Binary files a/public/fonts/Montserrat/Montserrat-Italic.ttf and /dev/null differ diff --git a/public/fonts/Montserrat/Montserrat-Light.ttf b/public/fonts/Montserrat/Montserrat-Light.ttf deleted file mode 100644 index c5dfdb7..0000000 Binary files a/public/fonts/Montserrat/Montserrat-Light.ttf and /dev/null differ diff --git a/public/fonts/Montserrat/Montserrat-LightItalic.ttf b/public/fonts/Montserrat/Montserrat-LightItalic.ttf deleted file mode 100644 index 5bdce7f..0000000 Binary files a/public/fonts/Montserrat/Montserrat-LightItalic.ttf and /dev/null differ diff --git a/public/fonts/Montserrat/Montserrat-Medium.ttf b/public/fonts/Montserrat/Montserrat-Medium.ttf deleted file mode 100644 index dfc7e2f..0000000 Binary files a/public/fonts/Montserrat/Montserrat-Medium.ttf and /dev/null differ diff --git a/public/fonts/Montserrat/Montserrat-MediumItalic.ttf b/public/fonts/Montserrat/Montserrat-MediumItalic.ttf deleted file mode 100644 index ce56883..0000000 Binary files a/public/fonts/Montserrat/Montserrat-MediumItalic.ttf and /dev/null differ diff --git a/public/fonts/Montserrat/Montserrat-Regular.ttf b/public/fonts/Montserrat/Montserrat-Regular.ttf deleted file mode 100644 index aa9033a..0000000 Binary files a/public/fonts/Montserrat/Montserrat-Regular.ttf and /dev/null differ diff --git a/public/fonts/Montserrat/Montserrat-SemiBold.ttf b/public/fonts/Montserrat/Montserrat-SemiBold.ttf deleted file mode 100644 index cbf44db..0000000 Binary files a/public/fonts/Montserrat/Montserrat-SemiBold.ttf and /dev/null differ diff --git a/public/fonts/Montserrat/Montserrat-SemiBoldItalic.ttf b/public/fonts/Montserrat/Montserrat-SemiBoldItalic.ttf deleted file mode 100644 index 7f9153d..0000000 Binary files a/public/fonts/Montserrat/Montserrat-SemiBoldItalic.ttf and /dev/null differ diff --git a/public/fonts/Montserrat/Montserrat-Thin.ttf b/public/fonts/Montserrat/Montserrat-Thin.ttf deleted file mode 100644 index 7c90a54..0000000 Binary files a/public/fonts/Montserrat/Montserrat-Thin.ttf and /dev/null differ diff --git a/public/fonts/Montserrat/Montserrat-ThinItalic.ttf b/public/fonts/Montserrat/Montserrat-ThinItalic.ttf deleted file mode 100644 index 94bcf55..0000000 Binary files a/public/fonts/Montserrat/Montserrat-ThinItalic.ttf and /dev/null differ diff --git a/styles/fonts.css b/styles/fonts.css index f1381c7..5d16742 100644 --- a/styles/fonts.css +++ b/styles/fonts.css @@ -1,6 +1 @@ -@font-face { - font-family: Montserrat; - src: url('../public/fonts/Montserrat/Montserrat-Medium.ttf'); - font-weight: 500; - font-style: normal; -} +@import url('@fontsource/montserrat/500.css'); diff --git a/yarn.lock b/yarn.lock index d1b7d13..97c2c3b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -390,6 +390,11 @@ minimatch "^3.0.4" strip-json-comments "^3.1.1" +"@fontsource/montserrat@^4.5.12": + version "4.5.12" + resolved "https://registry.yarnpkg.com/@fontsource/montserrat/-/montserrat-4.5.12.tgz#465c61fb508f6d0055dbcbfbc6eb7307a81fdf6f" + integrity sha512-UQ+4ijm1sddIBtmEZ9bKgCB1rSi4Imog0YKz7wDLtMQ3Mw2ZaBseTgoLDfbWnfdowS0PLp+Z4T2KZ/1AySTlDQ== + "@graphql-typed-document-node/core@^3.1.1": version "3.1.1" resolved "https://registry.yarnpkg.com/@graphql-typed-document-node/core/-/core-3.1.1.tgz#076d78ce99822258cf813ecc1e7fa460fa74d052"