diff --git a/site/layouts/_default/baseof.html b/site/layouts/_default/baseof.html
index 1a7a8bd..6906975 100644
--- a/site/layouts/_default/baseof.html
+++ b/site/layouts/_default/baseof.html
@@ -11,7 +11,7 @@
{{ with $stylesheet.css }}
{{ end }}
-
+
diff --git a/src/css/imports/typography.scss b/src/css/imports/typography.scss
index 90dab1b..ab9f79d 100644
--- a/src/css/imports/typography.scss
+++ b/src/css/imports/typography.scss
@@ -1,14 +1,22 @@
-@mixin font-body($weight: normal) {
+@mixin font-1($weight) {
font-family: "Montserrat", sans-serif;
- font-weight: $weight;
+ @if $weight == regular {
+ font-weight: 400;
+ } @else if $weight == bold {
+ font-weight: 600;
+ } @else {
+ @error "font-weight #{$weight} not in valid font-weights for font-1: 'Montserrat'.";
+ }
}
-@mixin font-title($weight: normal) {
- font-family: "Montserrat", sans-serif;
- font-weight: $weight;
+@mixin font-body($weight: regular) {
+ @include font-1($weight);
}
-@mixin font-link($weight: normal) {
- font-family: "Montserrat", sans-serif;
- font-weight: $weight;
+@mixin font-title($weight: regular) {
+ @include font-1($weight);
+}
+
+@mixin font-link($weight: regular) {
+ @include font-1($weight);
}
diff --git a/src/css/main.css b/src/css/main.css
index 6dd7260..fc876d7 100644
--- a/src/css/main.css
+++ b/src/css/main.css
@@ -6,9 +6,9 @@
@import "imports/mixins.scss";
+@import "imports/typography.scss";
@import "imports/base.scss";
@import "imports/layout.scss";
-@import "imports/typography.scss";
@import "imports/utility.scss";