diff --git a/apps/frontend/src/assets/css/fonts.css b/apps/frontend/src/assets/css/fonts.css new file mode 100644 index 000000000..e3b3f87e2 --- /dev/null +++ b/apps/frontend/src/assets/css/fonts.css @@ -0,0 +1,7 @@ +@font-face { + font-family: Nunito; + font-style: normal; + font-weight: 300 800; + src: url("../fonts/Nunito.ttf") format("truetype-variations"); + font-display: swap; +} diff --git a/apps/frontend/src/assets/css/scaffolding.css b/apps/frontend/src/assets/css/scaffolding.css index 8585b0a0f..364707af7 100644 --- a/apps/frontend/src/assets/css/scaffolding.css +++ b/apps/frontend/src/assets/css/scaffolding.css @@ -8,7 +8,7 @@ body { min-width: 320px; min-height: 100vh; margin: 0; - font-family: Arial, sans-serif; + font-family: Nunito, Arial, sans-serif; font-size: 14px; line-height: 1.5; } @@ -41,3 +41,10 @@ h5, h6 { margin: 0; } + +input, +button, +textarea, +select { + font-family: inherit; +} diff --git a/apps/frontend/src/assets/css/styles.css b/apps/frontend/src/assets/css/styles.css index 7dbf06a4d..ccf4abd1e 100644 --- a/apps/frontend/src/assets/css/styles.css +++ b/apps/frontend/src/assets/css/styles.css @@ -1,2 +1,3 @@ +@import url("./fonts.css"); @import url("./scaffolding.css"); @import url("./variables.css"); diff --git a/apps/frontend/src/assets/fonts/Nunito.ttf b/apps/frontend/src/assets/fonts/Nunito.ttf new file mode 100644 index 000000000..0a00f63fe Binary files /dev/null and b/apps/frontend/src/assets/fonts/Nunito.ttf differ diff --git a/package-lock.json b/package-lock.json index a1e0d703e..2cf9c7833 100644 --- a/package-lock.json +++ b/package-lock.json @@ -51,7 +51,7 @@ } }, "apps/backend": { - "version": "1.4.2", + "version": "1.4.4", "dependencies": { "@fastify/static": "7.0.4", "@fastify/swagger": "8.15.0", @@ -83,7 +83,7 @@ } }, "apps/frontend": { - "version": "1.6.0", + "version": "1.6.1", "dependencies": { "@hookform/resolvers": "3.9.0", "@reduxjs/toolkit": "2.2.7", @@ -181,6 +181,7 @@ "react-native-reanimated": "3.15.0", "react-native-safe-area-context": "4.10.9", "react-native-screens": "3.34.0", + "react-native-toast-message": "2.2.0", "react-redux": "9.1.2", "shared": "*" }, @@ -16279,6 +16280,16 @@ "react-native": "*" } }, + "node_modules/react-native-toast-message": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/react-native-toast-message/-/react-native-toast-message-2.2.0.tgz", + "integrity": "sha512-AFti8VzUk6JvyGAlLm9/BknTNDXrrhqnUk7ak/pM7uCTxDPveAu2ekszU0on6vnUPFnG04H/QfYE2IlETqeaWw==", + "license": "MIT", + "peerDependencies": { + "react": "*", + "react-native": "*" + } + }, "node_modules/react-native/node_modules/@jest/types": { "version": "26.6.2", "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.6.2.tgz",