Merge branch '55-modifier-la-police-pour-sf-pro-rounded' into 'master'

Resolve "Modifier la police pour SF Pro Rounded" Closes #55 See merge request !53

Merge branch '55-modifier-la-police-pour-sf-pro-rounded' into 'master'
49daf9ea · Sofiane Lasri · 2f72b733 · 050b03f7 · 49daf9ea · 49daf9ea
Commit 49daf9ea authored 6 months ago by Sofiane Lasri
--- a/resources/fonts/sf-pro-rounded/SF-Pro-Rounded-Black.otf
+++ b/resources/fonts/sf-pro-rounded/SF-Pro-Rounded-Black.otf
--- a/resources/fonts/sf-pro-rounded/SF-Pro-Rounded-Bold.otf
+++ b/resources/fonts/sf-pro-rounded/SF-Pro-Rounded-Bold.otf
--- a/resources/fonts/sf-pro-rounded/SF-Pro-Rounded-Heavy.otf
+++ b/resources/fonts/sf-pro-rounded/SF-Pro-Rounded-Heavy.otf
--- a/resources/fonts/sf-pro-rounded/SF-Pro-Rounded-Light.otf
+++ b/resources/fonts/sf-pro-rounded/SF-Pro-Rounded-Light.otf
--- a/resources/fonts/sf-pro-rounded/SF-Pro-Rounded-Medium.otf
+++ b/resources/fonts/sf-pro-rounded/SF-Pro-Rounded-Medium.otf
--- a/resources/fonts/sf-pro-rounded/SF-Pro-Rounded-Regular.otf
+++ b/resources/fonts/sf-pro-rounded/SF-Pro-Rounded-Regular.otf
--- a/resources/fonts/sf-pro-rounded/SF-Pro-Rounded-Semibold.otf
+++ b/resources/fonts/sf-pro-rounded/SF-Pro-Rounded-Semibold.otf
--- a/resources/fonts/sf-pro-rounded/SF-Pro-Rounded-Thin.otf
+++ b/resources/fonts/sf-pro-rounded/SF-Pro-Rounded-Thin.otf
--- a/resources/fonts/sf-pro-rounded/SF-Pro-Rounded-Ultralight.otf
+++ b/resources/fonts/sf-pro-rounded/SF-Pro-Rounded-Ultralight.otf
--- a/resources/scss/_fonts.scss
+++ b/resources/scss/_fonts.scss
+@font-face {
+    font-family: 'SF Pro Rounded';
+    font-weight: 100;
+    font-style: normal;
+    src: url('../fonts/sf-pro-rounded/SF-Pro-Rounded-Ultralight.otf') format('opentype');
+}
+
+@font-face {
+    font-family: 'SF Pro Rounded';
+    font-weight: 300;
+    font-style: normal;
+    src: url('../fonts/sf-pro-rounded/SF-Pro-Rounded-Light.otf') format('opentype');
+}
+
+@font-face {
+    font-family: 'SF Pro Rounded';
+    font-weight: 400;
+    font-style: normal;
+    src: url('../fonts/sf-pro-rounded/SF-Pro-Rounded-Thin.otf') format('opentype');
+}
+
+@font-face {
+    font-family: 'SF Pro Rounded';
+    font-weight: 500;
+    font-style: normal;
+    src: url('../fonts/sf-pro-rounded/SF-Pro-Rounded-Regular.otf') format('opentype');
+}
+
+@font-face {
+    font-family: 'SF Pro Rounded';
+    font-weight: 600;
+    font-style: normal;
+    src: url('../fonts/sf-pro-rounded/SF-Pro-Rounded-Medium.otf') format('opentype');
+}
+
+@font-face {
+    font-family: 'SF Pro Rounded';
+    font-weight: 700;
+    font-style: normal;
+    src: url('../fonts/sf-pro-rounded/SF-Pro-Rounded-Semibold.otf') format('opentype');
+}
+
+@font-face {
+    font-family: 'SF Pro Rounded';
+    font-weight: 800;
+    font-style: normal;
+    src: url('../fonts/sf-pro-rounded/SF-Pro-Rounded-Bold.otf') format('opentype');
+}
+
+@font-face {
+    font-family: 'SF Pro Rounded';
+    font-weight: 900;
+    font-style: normal;
+    src: url('../fonts/sf-pro-rounded/SF-Pro-Rounded-Heavy.otf') format('opentype');
+}
+
+@font-face {
+    font-family: 'SF Pro Rounded';
+    font-weight: 1000;
+    font-style: normal;
+    src: url('../fonts/sf-pro-rounded/SF-Pro-Rounded-Black.otf') format('opentype');
+}
\ No newline at end of file
--- a/resources/scss/public.scss
+++ b/resources/scss/public.scss
 @tailwind base;
 @tailwind components;
 @tailwind utilities;
+@import "fonts";

 .markdown {
    * {

--- a/resources/views/layouts/public.blade.php
+++ b/resources/views/layouts/public.blade.php
@@ -7,10 +7,6 @@
    <link rel="icon" type="image/svg+xml" href="{{ asset('favicon.svg') }}"/>
    <link rel="preconnect" href="https://fonts.googleapis.com">
    <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
-    <link href="https://fonts.googleapis.com/css2?family=PT+Sans:ital,wght@0,400;0,700;1,400;1,700&display=swap"
-          rel="stylesheet">
-    <link href="https://fonts.googleapis.com/css2?family=Nunito:ital,wght@0,200..1000;1,200..1000&display=swap"
-          rel="stylesheet">
    @vite(['resources/scss/public.scss', 'resources/js/app.js'])
 </head>
 <body>

--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -14,7 +14,7 @@ export default {
    theme: {
        extend: {
            fontFamily: {
-                sans: ['Nunito', ...defaultTheme.fontFamily.sans],
+                sans: ['SF Pro Rounded', ...defaultTheme.fontFamily.sans],
            },
            colors: {
                'primary': colors.blue,