diff --git a/assets/sass/fonts.sass b/assets/sass/_fonts.sass similarity index 52% rename from assets/sass/fonts.sass rename to assets/sass/_fonts.sass index 9db2827..c9dff25 100644 --- a/assets/sass/fonts.sass +++ b/assets/sass/_fonts.sass @@ -1,28 +1,33 @@ -$fira-sans-font-path: '{{ "fonts/fira-sans" | absURL }}' -$lc-pro-font-path: '{{ "fonts/learning-curve" | absURL }}' - /* font definitions -@font-face +$fira-sans-font-path: "/fonts/fira-sans" +$lc-pro-font-path: "/fonts/learning-curve" + +@font-face font-family: "Fira Sans" font-style: normal font-weight: normal - src: local("Fira Sans Regular"), local("FiraSans-Regular"), url(#{$fira-sans-font-path}/FiraSans-Regular.ttf) format("woff2") + src: local("Fira Sans Regular"), local("FiraSans-Regular"), url(#{$fira-sans-font-path}/FiraSans-Regular.ttf) format("truetype") -@font-face +@font-face font-family: "Fira Sans" font-style: normal font-weight: bold - src: local("Fira Sans Bold"), local("FiraSans-Bold"), url(#{$fira-sans-font-path}/FiraSans-Bold.ttf) format("woff2") + src: local("Fira Sans Bold"), local("FiraSans-Bold"), url(#{$fira-sans-font-path}/FiraSans-Bold.ttf) format("truetype") -@font-face +@font-face font-family: "Fira Sans Medium" font-style: normal font-weight: normal - src: local("Fira Sans Medium"), local("FiraSans-Medium"), url(#{$fira-sans-font-path}/FiraSans-Medium.ttf) format("woff2") + src: local("Fira Sans Medium"), local("FiraSans-Medium"), url(#{$fira-sans-font-path}/FiraSans-Medium.ttf) format("truetype") -@font-face +@font-face font-family: "Learning Curve Pro" font-style: normal font-weight: normal - src: local("Learning Curve Pro Regular"), local("LearningCurvePro-Regular"), url(#{$lc-pro-font-path}/learning_curve_regular_ot_tt.ttf) format("woff2") + src: local("Learning Curve Pro Regular"), local("LearningCurvePro-Regular"), url(#{$lc-pro-font-path}/learning_curve_regular_ot_tt.ttf) format("truetype") +@font-face + font-family: "Learning Curve Pro" + font-style: normal + font-weight: bold + src: local("Learning Curve Pro Bold"), local("LearningCurvePro-Bold"), url(#{$lc-pro-font-path}/learning_curve_bold_ot_tt.ttf) format("truetype") diff --git a/assets/sass/main.sass b/assets/sass/main.sass index e8add04..a2e3e31 100644 --- a/assets/sass/main.sass +++ b/assets/sass/main.sass @@ -1,7 +1,7 @@ @import "fonts" -/* font stack definitions -$font-stack: "Fira Sans", sans-serif +/* font stack definition +$regular-font-stack: "Fira Sans", sans-serif $medium-font-stack: "Fira Sans Medium", sans-serif $website-title-font-stack: "Learning Curve Pro" @@ -14,7 +14,7 @@ $color-dark-brown: #52453F $color-white: #FFFFFF body - font: 100% $font-stack + font: 100% $regular-font-stack color: $color-dark-brown background: $color-mint @@ -28,7 +28,8 @@ h3 font: 200% $medium-font-stack #website-title - font: 300% $website-title-font-stack - font-weight: normal + font-size: 4.5em + font-family: $website-title-font-stack + font-weight: bold color: $color-white diff --git a/layouts/index.html b/layouts/index.html index 46e28da..d86b002 100644 --- a/layouts/index.html +++ b/layouts/index.html @@ -2,15 +2,31 @@ {{ partial "css.html" . }} + {{ partial "script.html" . }} -

Florian Schrofner

- {{ with .Site.GetPage "/intro" }} - {{.Content}} - {{ end }} +
+
+
+

Florian Schrofner

+
+
- {{ with .Site.GetPage "/section" }} - {{.Content}} - {{ end }} +
+
+ {{ with .Site.GetPage "/intro" }} + {{.Content}} + {{ end }} +
+
+ +
+
+ {{ with .Site.GetPage "/section" }} + {{.Content}} + {{ end }} +
+
+
diff --git a/layouts/partials/script.html b/layouts/partials/script.html new file mode 100644 index 0000000..b4a127d --- /dev/null +++ b/layouts/partials/script.html @@ -0,0 +1,2 @@ +{{ $foundation := "foundation/js/vendor/foundation.min.js" | absURL }} + diff --git a/resources/_gen/assets/sass/sass/main.sass_53f3898349edb2b37d3b88b00109892b.content b/resources/_gen/assets/sass/sass/main.sass_53f3898349edb2b37d3b88b00109892b.content new file mode 100644 index 0000000..5222c2d --- /dev/null +++ b/resources/_gen/assets/sass/sass/main.sass_53f3898349edb2b37d3b88b00109892b.content @@ -0,0 +1 @@ +@font-face{font-family:fira sans;font-style:normal;font-weight:400;src:local("Fira Sans Regular"),local(FiraSans-Regular),url(/fonts/fira-sans/FiraSans-Regular.ttf) format("truetype")}@font-face{font-family:fira sans;font-style:normal;font-weight:700;src:local("Fira Sans Bold"),local(FiraSans-Bold),url(/fonts/fira-sans/FiraSans-Bold.ttf) format("truetype")}@font-face{font-family:fira sans medium;font-style:normal;font-weight:400;src:local("Fira Sans Medium"),local(FiraSans-Medium),url(/fonts/fira-sans/FiraSans-Medium.ttf) format("truetype")}@font-face{font-family:learning curve pro;font-style:normal;font-weight:400;src:local("Learning Curve Pro Regular"),local(LearningCurvePro-Regular),url(/fonts/learning-curve/learning_curve_regular_ot_tt.ttf) format("truetype")}@font-face{font-family:learning curve pro;font-style:normal;font-weight:700;src:local("Learning Curve Pro Bold"),local(LearningCurvePro-Bold),url(/fonts/learning-curve/learning_curve_bold_ot_tt.ttf) format("truetype")}body{font:100% fira sans,sans-serif;color:#52453f;background:#bfcecd}h1{font:300% fira sans medium,sans-serif}h2{font:250% fira sans medium,sans-serif}h3{font:200% fira sans medium,sans-serif}#website-title{font-size:4.5em;font-family:learning curve pro;font-weight:700;color:#fff} \ No newline at end of file diff --git a/resources/_gen/assets/sass/sass/main.sass_53f3898349edb2b37d3b88b00109892b.json b/resources/_gen/assets/sass/sass/main.sass_53f3898349edb2b37d3b88b00109892b.json new file mode 100644 index 0000000..d773bfa --- /dev/null +++ b/resources/_gen/assets/sass/sass/main.sass_53f3898349edb2b37d3b88b00109892b.json @@ -0,0 +1 @@ +{"Target":"css/main.min.css","MediaType":"text/css","Data":{}} \ No newline at end of file