diff --git a/ianonavy/_includes/head.html b/ianonavy/_includes/head.html index 47057b5..4791d60 100644 --- a/ianonavy/_includes/head.html +++ b/ianonavy/_includes/head.html @@ -1,12 +1,21 @@ - - - + + + - {% if page.title %}{{ page.title }}{% else %}{{ site.title }}{% endif %} - + + {% if page.title %}{{ page.title }}{% else %}{{ site.title }}{% endif %} + + - - + + diff --git a/ianonavy/_sass/_base.scss b/ianonavy/_sass/_base.scss index c750fcc..d5607e1 100644 --- a/ianonavy/_sass/_base.scss +++ b/ianonavy/_sass/_base.scss @@ -80,7 +80,7 @@ li { * Headings */ h1, h2, h3, h4, h5, h6 { - font-weight: 300; + font-weight: 400; } diff --git a/ianonavy/_sass/_font.scss b/ianonavy/_sass/_font.scss new file mode 100644 index 0000000..da6289c --- /dev/null +++ b/ianonavy/_sass/_font.scss @@ -0,0 +1,17 @@ +@font-face { + font-family: 'Open Sans'; + font-style: normal; + font-weight: 300; + font-stretch: 100%; + font-display: swap; + src: url(/fonts/OpenSans-Light.ttf) format('opentype'); +} + +@font-face { + font-family: 'Open Sans'; + font-style: normal; + font-weight: 400; + font-stretch: 100%; + font-display: swap; + src: url(/fonts/OpenSans-Regular.ttf) format('opentype'); +} diff --git a/ianonavy/_sass/_layout.scss b/ianonavy/_sass/_layout.scss index 0f320e9..6da523b 100644 --- a/ianonavy/_sass/_layout.scss +++ b/ianonavy/_sass/_layout.scss @@ -32,6 +32,7 @@ .name { font-size: 26px; + font-weight: 400; line-height: 28px; letter-spacing: -1px; margin-bottom: 0; diff --git a/ianonavy/css/main.scss b/ianonavy/css/main.scss index 6770bc2..201aae3 100755 --- a/ianonavy/css/main.scss +++ b/ianonavy/css/main.scss @@ -6,7 +6,7 @@ // Our variables -$base-font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; +$base-font-family: "Open Sans", sans-serif; $base-font-size: 16px; $small-font-size: $base-font-size * 0.875; $base-line-height: 1.5; @@ -49,6 +49,7 @@ $on-laptop: 800px; // Import partials from `sass_dir` (defaults to `_sass`) @import "base", + "font", "layout", "syntax-highlighting" ; diff --git a/ianonavy/fonts/OpenSans-Light.ttf b/ianonavy/fonts/OpenSans-Light.ttf new file mode 100644 index 0000000..cf8e0c7 Binary files /dev/null and b/ianonavy/fonts/OpenSans-Light.ttf differ diff --git a/ianonavy/fonts/OpenSans-Regular.ttf b/ianonavy/fonts/OpenSans-Regular.ttf new file mode 100644 index 0000000..29e9e60 Binary files /dev/null and b/ianonavy/fonts/OpenSans-Regular.ttf differ