diff --git a/themes/doingstuff-zola/sass/doingstuff/_base.scss b/themes/doingstuff-zola/sass/doingstuff/_base.scss index 884cea2..6fe86d7 100644 --- a/themes/doingstuff-zola/sass/doingstuff/_base.scss +++ b/themes/doingstuff-zola/sass/doingstuff/_base.scss @@ -10,7 +10,7 @@ html { line-height: $root-line-height; font-weight: $root-font-weight; @media (min-width: $large-breakpoint) { - font-size: $large-font-size; + font-size: $large-device-font-size; } } diff --git a/themes/doingstuff-zola/sass/doingstuff/_responsive.scss b/themes/doingstuff-zola/sass/doingstuff/_responsive.scss index f79af8b..8b6924f 100644 --- a/themes/doingstuff-zola/sass/doingstuff/_responsive.scss +++ b/themes/doingstuff-zola/sass/doingstuff/_responsive.scss @@ -2,10 +2,6 @@ // 320px ~ 16rem/16px ~ 18.8235/17px ~ 17.7778/18px // 480px ~ 30rem/16px ~ 28.2353rem/17px ~ 26.6667rem/18px @media (max-width: 768px) { - html, - body { - font-size: $small-device-font-size; - } .hidden-tablet { display: none; } @@ -20,10 +16,6 @@ // tablet/medium device ~768px+ // 768px ~ 48em/16px ~ 45.1765em/17px ~ 42.6667/18px @media (min-width: 768px) { - html, - body { - font-size: $large-device-font-size; - } .topbar-title { flex: 1 1 60%; } diff --git a/themes/doingstuff-zola/sass/doingstuff/_variables.scss b/themes/doingstuff-zola/sass/doingstuff/_variables.scss index 9a8ddb3..26b5838 100644 --- a/themes/doingstuff-zola/sass/doingstuff/_variables.scss +++ b/themes/doingstuff-zola/sass/doingstuff/_variables.scss @@ -18,14 +18,14 @@ $cyan: #75b5aa; $blue: #167bc2; $brown: #8f5536; -$root-font-family: "Source Sans Pro","Arial",sans-serif; +$root-font-family: "InterVariable", system-ui, sans-serif; // poole's variables $root-font-size: 1rem; $root-font-weight: 400; $root-line-height: 1.6em; -$body-color: #0d3a58; +$body-color: #000000; $body-bg: #fff; $border-color: #e5e5e5; @@ -40,8 +40,8 @@ $font-scale-dot8: .8rem; $small-device-font-size: $root-font-size; $large-device-font-size: $large-font-size; -// https://www.client9.com/css-system-font-stack-monospace-v2 -$code-font-family: "SFMono-Regular", "SF-Mono", Menlo, Monaco, Consolas, "Liberation Mono", "Roboto Mono", "Ubuntu Mono", "Courier New", Courier, monospace; +// https://github.com/system-fonts/modern-font-stacks +$code-font-family: ui-monospace, 'Cascadia Code', 'Source Code Pro', Menlo, Consolas, 'DejaVu Sans Mono', monospace; $code-font-size: .9rem; $code-fence-font-size: .8rem; //$code-color: #bf616a; diff --git a/themes/doingstuff-zola/sass/fonts.scss b/themes/doingstuff-zola/sass/fonts.scss index 46dbacd..956a614 100644 --- a/themes/doingstuff-zola/sass/fonts.scss +++ b/themes/doingstuff-zola/sass/fonts.scss @@ -1,41 +1,17 @@ -/*! Source Sans Pro */ +/*! InterVariable */ @font-face { - font-family: 'Source Sans Pro'; + font-family: InterVariable; font-style: normal; - font-weight: 400; + font-weight: 100 900; font-display: swap; - src: url(fonts/Source_Sans_Pro/SourceSansPro-Regular.ttf) format('truetype') + src: url('fonts/inter/InterVariable.woff2') format('woff2'); } -@font-face { - font-family: 'Source Sans Pro'; - font-style: normal; - font-weight: 600; - font-display: swap; - src: url(fonts/Source_Sans_Pro/SourceSansPro-SemiBold.ttf) format('truetype') -} - -@font-face { - font-family: 'Source Sans Pro'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url(fonts/Source_Sans_Pro/SourceSansPro-Bold.ttf) format('truetype') -} - -@font-face { - font-family: 'Source Sans Pro'; - font-style: normal; - font-weight: 900; - font-display: swap; - src: url(fonts/Source_Sans_Pro/SourceSansPro-Black.ttf) format('truetype') -} - -/*! Lato */ -@font-face { - font-family: Lato; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(fonts/Lato/Lato-Regular.ttf) format('truetype') -} \ No newline at end of file +/* Not Required */ +// @font-face { +// font-family: InterVariable; +// font-style: italic; +// font-weight: 100 900; +// font-display: swap; +// src: url('fonts/inter/InterVariable-Italic.woff2') format('woff2'); +// } \ No newline at end of file diff --git a/themes/doingstuff-zola/static/fonts/Lato/Lato-Regular.ttf b/themes/doingstuff-zola/static/fonts/Lato/Lato-Regular.ttf deleted file mode 100644 index bb2e887..0000000 Binary files a/themes/doingstuff-zola/static/fonts/Lato/Lato-Regular.ttf and /dev/null differ diff --git a/themes/doingstuff-zola/static/fonts/Source_Sans_Pro/OFL.txt b/themes/doingstuff-zola/static/fonts/Source_Sans_Pro/OFL.txt deleted file mode 100644 index bce8032..0000000 --- a/themes/doingstuff-zola/static/fonts/Source_Sans_Pro/OFL.txt +++ /dev/null @@ -1,93 +0,0 @@ -Copyright 2010, 2012, 2014 Adobe Systems Incorporated (http://www.adobe.com/), with Reserved Font Name ‘Source’. - -This Font Software is licensed under the SIL Open Font License, Version 1.1. -This license is copied below, and is also available with a FAQ at: -http://scripts.sil.org/OFL - - ------------------------------------------------------------ -SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 ------------------------------------------------------------ - -PREAMBLE -The goals of the Open Font License (OFL) are to stimulate worldwide -development of collaborative font projects, to support the font creation -efforts of academic and linguistic communities, and to provide a free and -open framework in which fonts may be shared and improved in partnership -with others. - -The OFL allows the licensed fonts to be used, studied, modified and -redistributed freely as long as they are not sold by themselves. The -fonts, including any derivative works, can be bundled, embedded, -redistributed and/or sold with any software provided that any reserved -names are not used by derivative works. The fonts and derivatives, -however, cannot be released under any other type of license. The -requirement for fonts to remain under this license does not apply -to any document created using the fonts or their derivatives. - -DEFINITIONS -"Font Software" refers to the set of files released by the Copyright -Holder(s) under this license and clearly marked as such. This may -include source files, build scripts and documentation. - -"Reserved Font Name" refers to any names specified as such after the -copyright statement(s). - -"Original Version" refers to the collection of Font Software components as -distributed by the Copyright Holder(s). - -"Modified Version" refers to any derivative made by adding to, deleting, -or substituting -- in part or in whole -- any of the components of the -Original Version, by changing formats or by porting the Font Software to a -new environment. - -"Author" refers to any designer, engineer, programmer, technical -writer or other person who contributed to the Font Software. - -PERMISSION & CONDITIONS -Permission is hereby granted, free of charge, to any person obtaining -a copy of the Font Software, to use, study, copy, merge, embed, modify, -redistribute, and sell modified and unmodified copies of the Font -Software, subject to the following conditions: - -1) Neither the Font Software nor any of its individual components, -in Original or Modified Versions, may be sold by itself. - -2) Original or Modified Versions of the Font Software may be bundled, -redistributed and/or sold with any software, provided that each copy -contains the above copyright notice and this license. These can be -included either as stand-alone text files, human-readable headers or -in the appropriate machine-readable metadata fields within text or -binary files as long as those fields can be easily viewed by the user. - -3) No Modified Version of the Font Software may use the Reserved Font -Name(s) unless explicit written permission is granted by the corresponding -Copyright Holder. This restriction only applies to the primary font name as -presented to the users. - -4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font -Software shall not be used to promote, endorse or advertise any -Modified Version, except to acknowledge the contribution(s) of the -Copyright Holder(s) and the Author(s) or with their explicit written -permission. - -5) The Font Software, modified or unmodified, in part or in whole, -must be distributed entirely under this license, and must not be -distributed under any other license. The requirement for fonts to -remain under this license does not apply to any document created -using the Font Software. - -TERMINATION -This license becomes null and void if any of the above conditions are -not met. - -DISCLAIMER -THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT -OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE -COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL -DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM -OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/themes/doingstuff-zola/static/fonts/Source_Sans_Pro/SourceSansPro-Black.ttf b/themes/doingstuff-zola/static/fonts/Source_Sans_Pro/SourceSansPro-Black.ttf deleted file mode 100644 index 7fd067f..0000000 Binary files a/themes/doingstuff-zola/static/fonts/Source_Sans_Pro/SourceSansPro-Black.ttf and /dev/null differ diff --git a/themes/doingstuff-zola/static/fonts/Source_Sans_Pro/SourceSansPro-Bold.ttf b/themes/doingstuff-zola/static/fonts/Source_Sans_Pro/SourceSansPro-Bold.ttf deleted file mode 100644 index eb71940..0000000 Binary files a/themes/doingstuff-zola/static/fonts/Source_Sans_Pro/SourceSansPro-Bold.ttf and /dev/null differ diff --git a/themes/doingstuff-zola/static/fonts/Source_Sans_Pro/SourceSansPro-Regular.ttf b/themes/doingstuff-zola/static/fonts/Source_Sans_Pro/SourceSansPro-Regular.ttf deleted file mode 100644 index 5623846..0000000 Binary files a/themes/doingstuff-zola/static/fonts/Source_Sans_Pro/SourceSansPro-Regular.ttf and /dev/null differ diff --git a/themes/doingstuff-zola/static/fonts/Source_Sans_Pro/SourceSansPro-SemiBold.ttf b/themes/doingstuff-zola/static/fonts/Source_Sans_Pro/SourceSansPro-SemiBold.ttf deleted file mode 100644 index 22540d1..0000000 Binary files a/themes/doingstuff-zola/static/fonts/Source_Sans_Pro/SourceSansPro-SemiBold.ttf and /dev/null differ diff --git a/themes/doingstuff-zola/static/fonts/inter/InterVariable-Italic.woff2 b/themes/doingstuff-zola/static/fonts/inter/InterVariable-Italic.woff2 new file mode 100644 index 0000000..f22ec25 Binary files /dev/null and b/themes/doingstuff-zola/static/fonts/inter/InterVariable-Italic.woff2 differ diff --git a/themes/doingstuff-zola/static/fonts/inter/InterVariable.woff2 b/themes/doingstuff-zola/static/fonts/inter/InterVariable.woff2 new file mode 100644 index 0000000..22a12b0 Binary files /dev/null and b/themes/doingstuff-zola/static/fonts/inter/InterVariable.woff2 differ diff --git a/themes/doingstuff-zola/static/fonts/Lato/OFL.txt b/themes/doingstuff-zola/static/fonts/inter/LICENSE.txt similarity index 97% rename from themes/doingstuff-zola/static/fonts/Lato/OFL.txt rename to themes/doingstuff-zola/static/fonts/inter/LICENSE.txt index 98383e3..9b2ca37 100644 --- a/themes/doingstuff-zola/static/fonts/Lato/OFL.txt +++ b/themes/doingstuff-zola/static/fonts/inter/LICENSE.txt @@ -1,10 +1,9 @@ -Copyright (c) 2010-2014 by tyPoland Lukasz Dziedzic (team@latofonts.com) with Reserved Font Name "Lato" +Copyright (c) 2016 The Inter Project Authors (https://github.com/rsms/inter) This Font Software is licensed under the SIL Open Font License, Version 1.1. This license is copied below, and is also available with a FAQ at: http://scripts.sil.org/OFL - ----------------------------------------------------------- SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 ----------------------------------------------------------- @@ -18,7 +17,7 @@ with others. The OFL allows the licensed fonts to be used, studied, modified and redistributed freely as long as they are not sold by themselves. The -fonts, including any derivative works, can be bundled, embedded, +fonts, including any derivative works, can be bundled, embedded, redistributed and/or sold with any software provided that any reserved names are not used by derivative works. The fonts and derivatives, however, cannot be released under any other type of license. The @@ -44,7 +43,7 @@ new environment. "Author" refers to any designer, engineer, programmer, technical writer or other person who contributed to the Font Software. -PERMISSION & CONDITIONS +PERMISSION AND CONDITIONS Permission is hereby granted, free of charge, to any person obtaining a copy of the Font Software, to use, study, copy, merge, embed, modify, redistribute, and sell modified and unmodified copies of the Font diff --git a/themes/doingstuff-zola/templates/base.html b/themes/doingstuff-zola/templates/base.html index 6a9a648..cfa0fd2 100644 --- a/themes/doingstuff-zola/templates/base.html +++ b/themes/doingstuff-zola/templates/base.html @@ -13,6 +13,7 @@ + {%- if config.generate_feeds %} {% for feed in config.feed_filenames %}