From ff442443084733b82235571c545e8d3fb16353ff Mon Sep 17 00:00:00 2001 From: Yannick Date: Tue, 7 Apr 2020 21:28:03 +0200 Subject: [PATCH] Add new fonts for the platform --- app/assets/stylesheets/application.css.scss | 9 +++------ app/views/home/index.html.erb | 17 ++++++++++++----- app/views/layouts/application.html.erb | 2 +- 3 files changed, 16 insertions(+), 12 deletions(-) diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss index 463abf5..3f248e1 100644 --- a/app/assets/stylesheets/application.css.scss +++ b/app/assets/stylesheets/application.css.scss @@ -14,13 +14,10 @@ *= require_self */ @import "bulma/sass/utilities/initial-variables"; -@import url('https://fonts.googleapis.com/css2?family=Quicksand:wght@400;500;600;700&family=Lobster&display=swap'); - -$family-sans-serif: "Helvetica", -"Arial", -sans-serif; -$family-primary: 'Quicksand', sans-serif; +@import url('https://fonts.googleapis.com/css2?family=Roboto:ital,wght@0,300;0,400;0,500;1,300;1,400&family=Lobster&family=Comfortaa:wght@400;500;600;700&display=swap'); +$family-sans-serif: 'Roboto', sans-serif; +$family-secondary: 'Comfortaa', cursive; // // https://coolors.co/06aed5-086788-f0c808-fff1d0-dd1c1a // $blue: #083d77; // $red: #dd1c1a; diff --git a/app/views/home/index.html.erb b/app/views/home/index.html.erb index 93d8579..5be9a9b 100644 --- a/app/views/home/index.html.erb +++ b/app/views/home/index.html.erb @@ -1,5 +1,12 @@ -
-

Welcome

- - <%= link_to "Login", login_url %> -
\ No newline at end of file +
+
+
+

+ Welcome +

+

+ Generate forms instantly +

+
+
+
\ No newline at end of file diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index b48478b..d3a893c 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -45,7 +45,7 @@ -
+
<%= yield %>