diff --git a/_sass/boilerplate/_mixins.scss b/_sass/boilerplate/_mixins.scss
index 53df025cc8407bff8eb8e1ce9b22222289afd3ca..0ca3fc13aec9344b76bd4b6b831d42576b5c83fe 100644
--- a/_sass/boilerplate/_mixins.scss
+++ b/_sass/boilerplate/_mixins.scss
@@ -92,7 +92,7 @@
@mixin font-bold { font-weight: 700; }
@mixin font-regular { font-weight: normal; }
-@mixin font-very-large { font-size: 1.5rem; }
+@mixin font-very-large { font-size: 1.35rem; }
@mixin font-large { font-size: 1.2rem; }
@mixin font-normal { font-size: 1.0rem; }
@mixin font-small { font-size: 0.9rem; }
@@ -106,7 +106,7 @@
@mixin font-heading {
@include font-bold;
- font-family: "Hermann", sans-serif;
+ font-family: "Noto Sans", sans-serif;
}
@mixin font-text {
@@ -114,7 +114,7 @@
@include font-regular;
text-transform: none;
- font-family: "Corporate S", serif;
+ font-family: "Noto Sans", sans-serif;
}
/*
diff --git a/_sass/common/_article.scss b/_sass/common/_article.scss
index 7b806b30076a8295dddc6ea729989df3a31383e7..7a58d08a5ddac3aea0cd90ba30a5c065d3f0ca98 100644
--- a/_sass/common/_article.scss
+++ b/_sass/common/_article.scss
@@ -93,6 +93,8 @@ article {
margin-right: 0;
}
+ font-size: 0.9rem;
+
code,
pre {
font-family: "mononoki";
diff --git a/_sass/common/_general.scss b/_sass/common/_general.scss
index 075fd708654102b1f9dfb3c0b8a7d6b3afbe449e..59e4f0f5a740211143c4e7c02fce48de115bcde5 100644
--- a/_sass/common/_general.scss
+++ b/_sass/common/_general.scss
@@ -1,14 +1,14 @@
html,
body {
- font-family: "Corporate S";
+ font-family: "Noto Sans";
/*
Reduce the font size and line height on smaller screens to make better
use of the reduced screen space.
*/
@include respond-to-medium(font-size, 20px, 18px, 18px);
- @include respond-to-medium(line-height, 1.5, 1.5, 1.375);
+ @include respond-to-medium(line-height, 1.6, 1.6, 1.5);
}
/*
@@ -100,6 +100,10 @@ h2 {
}
}
+.btn {
+ font-size: 0.9rem;
+}
+
// Replace the HTML details triangle with Fontawesome icons
summary {
list-style: none;
diff --git a/_sass/common/_title.scss b/_sass/common/_title.scss
index a9c382ee4a254c01728db602d53995ff266e664e..55a937b2147b671fd28d228545c305d762ed9e17 100644
--- a/_sass/common/_title.scss
+++ b/_sass/common/_title.scss
@@ -52,8 +52,8 @@ div#title {
justify-content: space-between;
h1 {
- font-size: 1.75rem;
- font-family: "Corporate S";
+ font-size: 1.575rem;
+ font-family: "Noto Sans";
}
video {
diff --git a/assets/css/fonts.css b/assets/css/fonts.css
index bf05d2a6e3eeab82ba4787add8dca007754e4164..ece16f5ecec288048c7d99b26b10cf7e5c121530 100644
--- a/assets/css/fonts.css
+++ b/assets/css/fonts.css
@@ -1,33 +1,19 @@
-/* #region CORPORATE S */
+/* #region NotoSans */
@font-face {
- font-family: "Corporate S";
+ font-family: "Noto Sans";
font-weight: 400;
- src: url(../font/corporate-s/CorporateS-Regular.ttf) format("truetype"); }
+ src: url(../font/NotoSans/NotoSans-Regular.ttf) format("truetype"); }
@font-face {
- font-family: "Corporate S";
+ font-family: "Noto Sans";
font-weight: 400;
font-style: italic;
- src: url(../font/corporate-s/CorporateS-RegularItalic.ttf) format("truetype"); }
+ src: url(../font/NotoSans/NotoSans-Italic.ttf) format("truetype"); }
@font-face {
- font-family: "Corporate S";
+ font-family: "Noto Sans";
font-weight: 700;
- src: url(../font/corporate-s/CorporateS-Bold.ttf) format("truetype"); }
-
-@font-face {
- font-family: "Corporate S";
- font-weight: 700;
- font-style: italic;
- src: url(../font/corporate-s/CorporateS-BoldItalic.ttf) format("truetype"); }
-/* #endregion */
-
-/* #region HERMANN */
-@font-face {
- font-family: "Hermann";
- font-weight: 700;
- src: url(../font/hermann/Hermann-Bold.ttf) format("truetype"); }
-/* #endregion */
+ src: url(../font/NotoSans/NotoSans-Bold.ttf) format("truetype"); }
/* #region MONONOKI */
@font-face {
diff --git a/assets/css/frontpage.scss b/assets/css/frontpage.scss
index 23d612b125a5970a3780cc67a7b747164bbdc169..8d132478e825b3169d8b25272e485655430f19d0 100644
--- a/assets/css/frontpage.scss
+++ b/assets/css/frontpage.scss
@@ -90,7 +90,7 @@
h1, h2, h3 {
@include font-heading;
- font-family: Corporate S;
+ font-family: Noto Sans;
margin-top: 0.55rem;
margin-bottom: 0.25rem;
}
@@ -111,6 +111,7 @@
.toast {
color: black;
}
+ font-size: 0.9rem;
}
.frontpage-wide-jumbotron {
diff --git a/assets/css/title/service-title-buttons.scss b/assets/css/title/service-title-buttons.scss
index da2fc8542920b6da4c3a227f66e545d5dfe2ee44..37c0dfea4cd1cd6edae7c0a00e3158a579eab061 100644
--- a/assets/css/title/service-title-buttons.scss
+++ b/assets/css/title/service-title-buttons.scss
@@ -33,7 +33,7 @@
@include font-large;
@include font-bold;
- font-size: 1rem;
+ font-size: 0.9rem;
justify-content: center;
}
diff --git a/assets/font/Noto Sans Mono/NotoSansMono-VariableFont_wdth,wght.ttf b/assets/font/Noto Sans Mono/NotoSansMono-VariableFont_wdth,wght.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..9dabd9e7a4729ea8b2410e01f7851b1c5883a348
Binary files /dev/null and b/assets/font/Noto Sans Mono/NotoSansMono-VariableFont_wdth,wght.ttf differ
diff --git a/assets/font/Noto Sans Mono/OFL.txt b/assets/font/Noto Sans Mono/OFL.txt
new file mode 100644
index 0000000000000000000000000000000000000000..c9857270ccdd53adc22755d8c8cfe19f6e3d4595
--- /dev/null
+++ b/assets/font/Noto Sans Mono/OFL.txt
@@ -0,0 +1,93 @@
+Copyright 2012 Google Inc. All Rights Reserved.
+
+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/assets/font/NotoSans/NotoSans-Bold.ttf b/assets/font/NotoSans/NotoSans-Bold.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..3e68bc24167c9d26e2c982807c8b6f1e6c8047fc
Binary files /dev/null and b/assets/font/NotoSans/NotoSans-Bold.ttf differ
diff --git a/assets/font/NotoSans/NotoSans-Italic.ttf b/assets/font/NotoSans/NotoSans-Italic.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..eedc5e4593d3eef68109d35823560d98031a7e83
Binary files /dev/null and b/assets/font/NotoSans/NotoSans-Italic.ttf differ
diff --git a/assets/font/NotoSans/NotoSans-Regular.ttf b/assets/font/NotoSans/NotoSans-Regular.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..973bc2ed3a92372004f5bc0c3fe85092c75624e0
Binary files /dev/null and b/assets/font/NotoSans/NotoSans-Regular.ttf differ
diff --git a/assets/font/corporate-s-demi/CorporateS-DemiItalic.ttf b/assets/font/corporate-s-demi/CorporateS-DemiItalic.ttf
deleted file mode 100644
index 3c7f19a3255f52cc4369876a3342bafadb5ff382..0000000000000000000000000000000000000000
Binary files a/assets/font/corporate-s-demi/CorporateS-DemiItalic.ttf and /dev/null differ
diff --git a/assets/font/corporate-s-exbold/CorporateS-ExtraBold.ttf b/assets/font/corporate-s-exbold/CorporateS-ExtraBold.ttf
deleted file mode 100644
index 0ce56066d16ef5ac289cd2d538a020002845374f..0000000000000000000000000000000000000000
Binary files a/assets/font/corporate-s-exbold/CorporateS-ExtraBold.ttf and /dev/null differ
diff --git a/assets/font/corporate-s-exbold/CorporateS-ExtraBoldItalic.ttf b/assets/font/corporate-s-exbold/CorporateS-ExtraBoldItalic.ttf
deleted file mode 100644
index dd3c50548bde502c61c28761c61cf8053d004776..0000000000000000000000000000000000000000
Binary files a/assets/font/corporate-s-exbold/CorporateS-ExtraBoldItalic.ttf and /dev/null differ
diff --git a/assets/font/corporate-s-light/CorporateS-Light.ttf b/assets/font/corporate-s-light/CorporateS-Light.ttf
deleted file mode 100644
index 809b71b6a5ac001dd9ab28ae7d3ac74aee08b649..0000000000000000000000000000000000000000
Binary files a/assets/font/corporate-s-light/CorporateS-Light.ttf and /dev/null differ
diff --git a/assets/font/corporate-s-light/CorporateS-LightItalic.ttf b/assets/font/corporate-s-light/CorporateS-LightItalic.ttf
deleted file mode 100644
index 72efbc9b16aa711b36e15aded756813c6a67da81..0000000000000000000000000000000000000000
Binary files a/assets/font/corporate-s-light/CorporateS-LightItalic.ttf and /dev/null differ
diff --git a/assets/font/corporate-s/CorporateS-Bold.ttf b/assets/font/corporate-s/CorporateS-Bold.ttf
deleted file mode 100644
index 7f429873008d9ff0722ad4c95f85521fb5698245..0000000000000000000000000000000000000000
Binary files a/assets/font/corporate-s/CorporateS-Bold.ttf and /dev/null differ
diff --git a/assets/font/corporate-s/CorporateS-BoldItalic.ttf b/assets/font/corporate-s/CorporateS-BoldItalic.ttf
deleted file mode 100644
index e2487326fc7105e89144566b34ccd20fb25bd51f..0000000000000000000000000000000000000000
Binary files a/assets/font/corporate-s/CorporateS-BoldItalic.ttf and /dev/null differ
diff --git a/assets/font/corporate-s/CorporateS-Regular.ttf b/assets/font/corporate-s/CorporateS-Regular.ttf
deleted file mode 100644
index 9e2fc4f701b2d78d522bc1447941290bdf1bada6..0000000000000000000000000000000000000000
Binary files a/assets/font/corporate-s/CorporateS-Regular.ttf and /dev/null differ
diff --git a/assets/font/corporate-s/CorporateS-RegularItalic.ttf b/assets/font/corporate-s/CorporateS-RegularItalic.ttf
deleted file mode 100644
index 5ff9d859941cc32bf5777762e4baf75f3eb2ae38..0000000000000000000000000000000000000000
Binary files a/assets/font/corporate-s/CorporateS-RegularItalic.ttf and /dev/null differ
diff --git a/assets/font/hermann/Hermann-Bold.ttf b/assets/font/hermann/Hermann-Bold.ttf
deleted file mode 100644
index e432f56fd951b0ba17307e77dbf2b91acd01f733..0000000000000000000000000000000000000000
Binary files a/assets/font/hermann/Hermann-Bold.ttf and /dev/null differ