diff --git a/front/src/fonts/RostelecomBasis-Bold.otf b/front/src/fonts/RostelecomBasis-Bold.otf new file mode 100644 index 0000000..d210a21 Binary files /dev/null and b/front/src/fonts/RostelecomBasis-Bold.otf differ diff --git a/front/src/fonts/RostelecomBasis-Light.otf b/front/src/fonts/RostelecomBasis-Light.otf new file mode 100644 index 0000000..919d68f Binary files /dev/null and b/front/src/fonts/RostelecomBasis-Light.otf differ diff --git a/front/src/fonts/RostelecomBasis-Medium.otf b/front/src/fonts/RostelecomBasis-Medium.otf new file mode 100644 index 0000000..bf0b140 Binary files /dev/null and b/front/src/fonts/RostelecomBasis-Medium.otf differ diff --git a/front/src/fonts/RostelecomBasis-Regular.otf b/front/src/fonts/RostelecomBasis-Regular.otf new file mode 100644 index 0000000..64acc57 Binary files /dev/null and b/front/src/fonts/RostelecomBasis-Regular.otf differ diff --git a/front/src/fonts/fonts.css b/front/src/fonts/fonts.css new file mode 100644 index 0000000..92323ee --- /dev/null +++ b/front/src/fonts/fonts.css @@ -0,0 +1,31 @@ +@font-face { + font-family: 'YourFont'; + src: url('./RostelecomBasis-Regular.otf') format('opentype'); + font-weight: normal; + font-style: normal; + font-display: swap; +} + +@font-face { + font-family: 'YourFont'; + src: url('./RostelecomBasis-Bold.otf') format('opentype'); + font-weight: bold; + font-style: normal; + font-display: swap; +} + +@font-face { + font-family: 'YourFont'; + src: url('./RostelecomBasis-Light.otf') format('opentype'); + font-weight: lighter; + font-style: normal; + font-display: swap; +} + +@font-face { + font-family: 'YourFont'; + src: url('./RostelecomBasis-Medium.otf') format('opentype'); + font-weight: normal; + font-style: normal; + font-display: swap; +} \ No newline at end of file diff --git a/front/src/index.css b/front/src/index.css index a4f6453..3b9c07f 100644 --- a/front/src/index.css +++ b/front/src/index.css @@ -1,7 +1,5 @@ :root { - font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen', - 'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue', - sans-serif; + font-family: 'YourFont', sans-serif; line-height: 1.5; font-weight: 400; @@ -14,8 +12,9 @@ -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; - --purple: 7700FF - --black + --purple: #7700ff; + --black: #101828; + --orange: #ff4f12; } #root { diff --git a/front/src/main.tsx b/front/src/main.tsx index 4d20e55..27d1c21 100644 --- a/front/src/main.tsx +++ b/front/src/main.tsx @@ -5,6 +5,7 @@ import { BrowserRouter } from 'react-router' import AppRoutes from './app/routes.tsx' import { Provider } from 'react-redux' import { store } from './app/store.ts' +import './fonts/fonts.css' createRoot(document.getElementById('root')!).render( diff --git a/front/src/pages/LoginPage/LoginPage.css b/front/src/pages/LoginPage/LoginPage.css index 1963ce6..265ff6d 100644 --- a/front/src/pages/LoginPage/LoginPage.css +++ b/front/src/pages/LoginPage/LoginPage.css @@ -4,7 +4,6 @@ align-items: center; justify-content: center; padding: 20px; - font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, sans-serif; } .login-logo {