From 4b4b326437f8081f4513efc42dc50f1003bcd7d5 Mon Sep 17 00:00:00 2001
From: Roland Bernard <rolbernard@unibz.it>
Date: Fri, 9 Apr 2021 09:56:35 +0200
Subject: [PATCH] Added fonts
---
client/src/App.scss | 1 +
client/src/index.tsx | 2 ++
client/src/styles/fonts.css | 4 ++++
client/src/styles/settings.scss | 2 +-
4 files changed, 8 insertions(+), 1 deletion(-)
create mode 100644 client/src/styles/fonts.css
diff --git a/client/src/App.scss b/client/src/App.scss
index bf618bc..47ae1ab 100644
--- a/client/src/App.scss
+++ b/client/src/App.scss
@@ -8,6 +8,7 @@ html {
body {
color: settings.$body-color;
+ font-family: settings.$body-font;
@include mixins.breakpoint(medium) {
color: black;
}
diff --git a/client/src/index.tsx b/client/src/index.tsx
index 98248ae..a129833 100644
--- a/client/src/index.tsx
+++ b/client/src/index.tsx
@@ -1,9 +1,11 @@
import React from 'react';
import ReactDOM from 'react-dom';
+
import App from 'App';
import * as serviceWorkerRegistration from './serviceWorkerRegistration';
import reportWebVitals from './reportWebVitals';
+import 'styles/fonts.css';
ReactDOM.render(
<React.StrictMode>
diff --git a/client/src/styles/fonts.css b/client/src/styles/fonts.css
new file mode 100644
index 0000000..9863ab8
--- /dev/null
+++ b/client/src/styles/fonts.css
@@ -0,0 +1,4 @@
+
+@import url('https://fonts.googleapis.com/css2?family=Poppins:ital,wght@0,300;0,400;0,500;0,600;0,700;1,300;1,400;1,500;1,600;1,700&display=swap');
+@import url('https://fonts.googleapis.com/icon?family=Material+Icons');
+
diff --git a/client/src/styles/settings.scss b/client/src/styles/settings.scss
index 31d0fe0..710f0bc 100644
--- a/client/src/styles/settings.scss
+++ b/client/src/styles/settings.scss
@@ -20,6 +20,7 @@ $linear-gradient: linear-gradient(to top, $primary, $secondary);
$radial-gradient: radial-gradient(100% 115% at 0% 0%, $primary 0%, $secondary 100%);
$body-color: #4B4B4B;
+$body-font: 'Poppins', sans-serif;
// Typography
$weight-light: 300;
@@ -28,7 +29,6 @@ $weight-medium: 500;
$weight-semi-bold: 600;
$weight-bold: 700;
-
// Breakpoints
$breakpoints: (
'small': 360px,
--
GitLab