From 7dcf1433e0c171510eea78d9e89026aef4ab8ca0 Mon Sep 17 00:00:00 2001 From: Lorin Werthen Date: Sat, 3 Sep 2016 16:42:58 +0200 Subject: [PATCH] pretty firefox font --- content/assets/stylesheets/includes/general.scss | 1 - content/assets/stylesheets/main.scss | 4 +--- content/index.erb | 2 +- layouts/default.erb | 6 ++++++ 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/content/assets/stylesheets/includes/general.scss b/content/assets/stylesheets/includes/general.scss index a7b40a3..e58252b 100644 --- a/content/assets/stylesheets/includes/general.scss +++ b/content/assets/stylesheets/includes/general.scss @@ -31,7 +31,6 @@ transition: 0.2s; font-variant: small-caps; - font-size: 1.25em; &:hover { transition: 0.2s; diff --git a/content/assets/stylesheets/main.scss b/content/assets/stylesheets/main.scss index d536382..8ad3912 100644 --- a/content/assets/stylesheets/main.scss +++ b/content/assets/stylesheets/main.scss @@ -1,9 +1,7 @@ @import "includes/variables"; -@import url(https://fonts.googleapis.com/css?family=Open+Sans:300,400,700); -$family-sans-serif: 'Open Sans', sans-serif; - +$family-sans-serif: 'Fira Sans', sans-serif; @import "../../../node_modules/bulma/bulma"; diff --git a/content/index.erb b/content/index.erb index f9cb053..512a76c 100644 --- a/content/index.erb +++ b/content/index.erb @@ -1,7 +1,7 @@ <% content_for :head do %> - + <% end %>
diff --git a/layouts/default.erb b/layouts/default.erb index 277102a..8f755dc 100644 --- a/layouts/default.erb +++ b/layouts/default.erb @@ -7,8 +7,14 @@ Zeus WPI | <%= item[:title] || 'Werkgroep Informatica van de Universiteit Gent' %> + + + + + + <%= asset :css, :main %>