diff --git a/_sass/_elements.scss b/_sass/_elements.scss index 131b3db..91fafc3 100644 --- a/_sass/_elements.scss +++ b/_sass/_elements.scss @@ -3,6 +3,7 @@ h1, h2, h3, h4, h5, h6 { font-family: _font(title); + font-weight: 700; } h1 { diff --git a/_sass/_layout.scss b/_sass/_layout.scss index aa415d0..3ee72d4 100644 --- a/_sass/_layout.scss +++ b/_sass/_layout.scss @@ -9,6 +9,7 @@ body { width: 100%; font-family: _font(family); font-weight: 300; + font-size: 1em; color: var(--fg); letter-spacing: _font(kerning); background-color: var(--bg); diff --git a/_sass/libs/_vars.scss b/_sass/libs/_vars.scss index 032508b..4c5c2d0 100644 --- a/_sass/libs/_vars.scss +++ b/_sass/libs/_vars.scss @@ -71,73 +71,25 @@ @font-face { - font-family: 'Jetbrain-regular'; + font-family: 'Terminus'; font-style: normal; font-weight: 400; - src: local('Jetbrain Regular'), local('Jetbrain-Regular'), url(/assets/fonts/jetBrainsMono/JetBrainsMono_Regular.ttf) format('truetype'), url(/assets/fonts/jetBrainsMono/JetBrainsMono-Regular.woff) format('woff'), url(/assets/fonts/jetBrainsMono/JetBrainsMono-Regular.woff2) format('woff2'); + src: local('Terminus Regular'), local('Terminus-Regular'), url(/assets/fonts/terminus/TerminusTTF.ttf) format('truetype'); unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; } -@font-face { - font-family: 'Jetbrain-regular'; - font-style: italic; - font-weight: 400; - src: local('Jetbrain Regular'), local('Jetbrain-Regular'), url(/assets/fonts/jetBrainsMono/JetBrainsMono_Italic.ttf) format('truetype'), url(/assets/fonts/jetBrainsMono/JetBrainsMono-Italic.woff) format('woff'), url(/assets/fonts/jetBrainsMono/JetBrainsMono-Italic.woff2) format('woff2'); - unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; -} -@font-face { - font-family: 'Jetbrain-Extrabold'; - font-style: normal; - font-weight: 700; - src: local('Jetbrain ExtraBold'), local('Jetbrain-ExtraBold'), url(/assets/fonts/jetBrainsMono/JetBrainsMono_ExtraBold.ttf) format('truetype'), url(/assets/fonts/jetBrainsMono/JetBrainsMono-ExtraBold.woff) format('woff'), url(/assets/fonts/jetBrainsMono/JetBrainsMono-ExtraBold.woff2) format('woff2'); - unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; -} -@font-face { - font-family: 'Jetbrain-Extrabold'; - font-style: italic; - font-weight: 700; - src: local('Jetbrain ExtraBold'), local('Jetbrain-ExtraBold'), url(/assets/fonts/JetBrainsMono_ExtraBold_Italic.ttf) format('truetype'), url(/assets/fonts/jetBrainsMono/JetBrainsMono-ExtraBold-Italic.woff) format('woff'), url(/assets/fonts/jetBrainsMono/JetBrainsMono-ExtraBold-Italic.woff2) format('woff2'); - unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; -} -@font-face { - font-family: 'Poppins'; - font-style: normal; - font-weight: 300; - src: local('Poppins Light'), local('Poppins-Light'), url(/assets/fonts/poppins/Poppins-Light.ttf) format('truetype'), url(/assets/fonts/poppins/popin-light.woff2) format('woff2'); - unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; -} -@font-face { - font-family: 'Poppins'; - font-style: italic; - font-weight: 300; - src: local('Poppins Light'), local('Poppins-Light'), url(/assets/fonts/poppins/Poppins-LightItalic.ttf) format('truetype'), url(/assets/fonts/poppins/popin-light-italic.woff2) format('woff2'); - unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; -} -@font-face { - font-family: 'Poppins'; - font-style: normal; - font-weight: 500; - src: local('Poppins Medium'), local('Poppins-Medium'), url(/assets/fonts/poppins/Poppins-Medium.ttf) format('truetype'), url(/assets/fonts/poppins/popin-medium.woff2) format('woff2'); - unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; -} -@font-face { - font-family: 'Poppins'; - font-style: italic; - font-weight: 500; - src: local('Poppins Medium'), local('Poppins-Medium'), url(/assets/fonts/poppins/Poppins-MediumItalic.ttf) format('truetype'), url(/assets/fonts/poppins/popin-medium-italic.woff2) format('woff2'); - unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; -} -@font-face { - font-family: 'Collects'; - font-style: normal; - font-weight: 500; - src: local('Collects'), local('Collects'), url(/assets/fonts/fz.otf) format('opentype'); - } +@font-face { + font-family: 'Terminus'; + font-style: normal; + font-weight: 700; + src: local('Terminus Bold'), local('Terminus-Vold'), url(/assets/fonts/terminus/TerminusTTF-Bold.ttf) format('truetype'); + unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; +} $font: ( - title: ('Collects', 'Jetbrain-Extrabold', 'Lucida Console', Monaco, monospace), - family: ('Poppins', 'Arial', 'Helvetica', sans-serif), - family-fixed: ('Jetbrain-Regular', 'Lucida Console', Monaco, monospace), + title: ('Terminus', 'Lucida Console', Monaco, monospace), + family: ('Terminus', 'Poppins', 'Arial', 'Helvetica', sans-serif), + family-fixed: ('Terminus', 'Lucida Console', Monaco, monospace), weight: 400, weight-bold: 700, kerning: 0em, diff --git a/assets/fonts/terminus/TerminusTTF-Bold.ttf b/assets/fonts/terminus/TerminusTTF-Bold.ttf new file mode 100644 index 0000000..3eeb0ad Binary files /dev/null and b/assets/fonts/terminus/TerminusTTF-Bold.ttf differ diff --git a/assets/fonts/terminus/TerminusTTF.ttf b/assets/fonts/terminus/TerminusTTF.ttf new file mode 100644 index 0000000..d302264 Binary files /dev/null and b/assets/fonts/terminus/TerminusTTF.ttf differ