From a9afea8fff7baefd0ed97e84fafbffdb1b9a0595 Mon Sep 17 00:00:00 2001 From: Luis Date: Sat, 17 Jun 2017 15:39:39 +0200 Subject: [PATCH 1/3] testing PlayfairDisplay font --- docs/css/main.scss | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/docs/css/main.scss b/docs/css/main.scss index 92197d9..3dcad9e 100755 --- a/docs/css/main.scss +++ b/docs/css/main.scss @@ -8,8 +8,8 @@ $baseurl: '{{ site.baseurl }}/images'; @import 'libs/functions'; @import 'libs/mixins'; @import 'font-awesome.min.css'; -@import url('//fonts.googleapis.com/css?family=Open+Sans:400,400italic,600,600italic,800,800italic'); - +//@import url('//fonts.googleapis.com/css?family=Open+Sans:400,400italic,600,600italic,800,800italic'); +@import url('//fonts.googleapis.com/css?family=Playfair+Display:400,700'); /* Spectral by HTML5 UP html5up.net | @n33co @@ -51,7 +51,8 @@ $baseurl: '{{ site.baseurl }}/images'; body, input, select, textarea { color: _palette(fg); - font-family: _font(family); + //font-family: _font(family); + font-family: 'Playfair Display', serif; font-size: 15pt; font-weight: _font(weight); letter-spacing: _size(letter-spacing); @@ -1225,7 +1226,7 @@ $baseurl: '{{ site.baseurl }}/images'; } .wrapper { - @include padding(6em, 0); + @include padding(6em, 0); &.alt { padding: 0; From 3ee78631594d66061a83a826799b36fe108f458b Mon Sep 17 00:00:00 2001 From: Luis Date: Sat, 17 Jun 2017 15:41:19 +0200 Subject: [PATCH 2/3] testing CrimsonText --- docs/css/main.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/css/main.scss b/docs/css/main.scss index 3dcad9e..f018c54 100755 --- a/docs/css/main.scss +++ b/docs/css/main.scss @@ -9,7 +9,7 @@ $baseurl: '{{ site.baseurl }}/images'; @import 'libs/mixins'; @import 'font-awesome.min.css'; //@import url('//fonts.googleapis.com/css?family=Open+Sans:400,400italic,600,600italic,800,800italic'); -@import url('//fonts.googleapis.com/css?family=Playfair+Display:400,700'); +@import url('//fonts.googleapis.com/css?family=Crimson+Text:400,400i,700'); /* Spectral by HTML5 UP html5up.net | @n33co @@ -52,7 +52,7 @@ $baseurl: '{{ site.baseurl }}/images'; body, input, select, textarea { color: _palette(fg); //font-family: _font(family); - font-family: 'Playfair Display', serif; + font-family: 'Crimson Text', serif; font-size: 15pt; font-weight: _font(weight); letter-spacing: _size(letter-spacing); From 46fae5f24d08e1d78011bbb8cd741ec84ab2551c Mon Sep 17 00:00:00 2001 From: Luis Date: Sat, 17 Jun 2017 15:42:32 +0200 Subject: [PATCH 3/3] back to OpenSans --- docs/css/main.scss | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/docs/css/main.scss b/docs/css/main.scss index f018c54..12863c3 100755 --- a/docs/css/main.scss +++ b/docs/css/main.scss @@ -8,8 +8,7 @@ $baseurl: '{{ site.baseurl }}/images'; @import 'libs/functions'; @import 'libs/mixins'; @import 'font-awesome.min.css'; -//@import url('//fonts.googleapis.com/css?family=Open+Sans:400,400italic,600,600italic,800,800italic'); -@import url('//fonts.googleapis.com/css?family=Crimson+Text:400,400i,700'); +@import url('//fonts.googleapis.com/css?family=Open+Sans:400,400italic,600,600italic,800,800italic'); /* Spectral by HTML5 UP html5up.net | @n33co @@ -51,8 +50,7 @@ $baseurl: '{{ site.baseurl }}/images'; body, input, select, textarea { color: _palette(fg); - //font-family: _font(family); - font-family: 'Crimson Text', serif; + font-family: _font(family); font-size: 15pt; font-weight: _font(weight); letter-spacing: _size(letter-spacing);