Fix order of heading override.

web/fonts/RedHat/OFL.txt

@@ -0,0 +1,93 @@
+Copyright 2021 The Red Hat Project Authors (https://github.com/RedHatOfficial/RedHatFont)
+
+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:
+https://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.

web/fonts/RedHat/faces.css

@@ -0,0 +1,47 @@
+@font-face {
+    font-family: "RedHatDisplay";
+    src: url("./RedHatDisplayVFModified.woff2") format("woff2-variations");
+    font-weight: 300 900;
+    font-style: normal;
+    font-display: fallback;
+}
+
+@font-face {
+    font-family: "RedHatDisplay";
+    src: url("./RedHatDisplayVF-ItalicModified.woff2") format("woff2-variations");
+    font-weight: 300 900;
+    font-style: italic;
+    font-display: fallback;
+}
+
+@font-face {
+    font-family: "RedHatText";
+    src: url("./RedHatTextVFModified.woff2") format("woff2-variations");
+    font-weight: 400 500;
+    font-style: normal;
+    font-display: fallback;
+}
+
+@font-face {
+    font-family: "RedHatText";
+    src: url("./RedHatTextVF-ItalicModified.woff2") format("woff2-variations");
+    font-weight: 400 500;
+    font-style: italic;
+    font-display: fallback;
+}
+
+@font-face {
+    font-family: "RedHatMono";
+    src: url("./RedHatMonoVF.woff2") format("woff2-variations");
+    font-weight: 300 700;
+    font-style: normal;
+    font-display: fallback;
+}
+
+@font-face {
+    font-family: "RedHatMono";
+    src: url("./RedHatMonoVF-Italic.woff2") format("woff2-variations");
+    font-weight: 300 700;
+    font-style: italic;
+    font-display: fallback;
+}

web/package.json

@@ -53,6 +53,7 @@
         }
     },
     "imports": {
+        "#fonts/*.css": "./fonts/*.css",
         "#styles/*.css": "./src/styles/*.css",
         "#styles/*": "./src/styles/*.js",
         "#common/*": "./src/common/*.js",

web/src/styles/authentik/base/fonts.css

@@ -1,3 +1,43 @@
+/* #region Generic Families */
+
+:root {
+    --ak-generic-serif: serif;
+    --ak-generic-sans-serif: "RedHatText", sans-serif;
+    --ak-generic-monospace: "RedHatMono", "Fira Code", "Courier New", monospace;
+    --ak-generic-symbols: "Noto Sans Symbols", "Segoe UI Symbol", "Apple Symbols", sans-serif;
+    --ak-generic-emoji:
+        "Noto Color Emoji", "Apple Color Emoji", "Segoe UI Emoji", emoji, sans-serif;
+    --ak-generic-body: var(--ak-generic-sans-serif);
+    --ak-generic-heading: var(--ak-generic-body);
+    --ak-generic-display: "RedHatDisplay", var(--ak-generic-heading);
+}
+
+/* #endregion */
+
+/* #region Font Families */
+
+:root {
+    --ak-font-family-sans-serif: var(--ak-generic-sans-serif);
+    --ak-font-family-heading: var(--ak-generic-heading);
+    --ak-font-family-monospace: var(--ak-generic-monospace);
+}
+
+/* #endregion */
+
+/* #region PF Mapping */
+
+:root {
+    --pf-global--FontFamily--sans-serif: var(--ak-font-family-sans-serif);
+    --pf-global--FontFamily--heading--sans-serif: var(--ak-generic-display);
+    --pf-global--FontFamily--monospace: var(--ak-font-family-monospace);
+    --pf-global--FontFamily--redhat-updated--sans-serif: var(--ak-font-family-sans-serif);
+    --pf-global--FontFamily--redhat-updated--heading--sans-serif: var(--ak-generic-display);
+}
+
+/* #endregion */
+
+/* #region Font Sizes and Weights */
+
 :root {
     --pf-global--FontSize--4xl: 2.25rem;
     --pf-global--FontSize--3xl: 1.75rem;
@@ -17,32 +57,4 @@
     --pf-global--LineHeight--md: 1.5;
 }
 
-:root {
-    --pf-global--FontFamily--sans-serif:
-        "RedHatText", "Overpass", overpass, helvetica, arial, sans-serif;
-    --pf-global--FontFamily--heading--sans-serif:
-        "RedHatDisplay", "Overpass", overpass, helvetica, arial, sans-serif;
-    --pf-global--FontFamily--monospace:
-        "Liberation Mono", consolas, "SFMono-Regular", menlo, monaco, "Courier New", monospace;
-    --pf-global--FontFamily--redhat-updated--sans-serif:
-        "RedHatTextUpdated", "Overpass", overpass, helvetica, arial, sans-serif;
-    --pf-global--FontFamily--redhat-updated--heading--sans-serif:
-        "RedHatDisplayUpdated", "Overpass", overpass, helvetica, arial, sans-serif;
-    --pf-global--FontFamily--redhat--monospace:
-        "RedHatMono", "Liberation Mono", consolas, "SFMono-Regular", menlo, monaco, "Courier New",
-        monospace;
-    --pf-global--FontFamily--redhatVF--sans-serif:
-        "RedHatTextVF", "RedHatText", "Overpass", overpass, helvetica, arial, sans-serif;
-    --pf-global--FontFamily--redhatVF--heading--sans-serif:
-        "RedHatDisplayVF", "RedHatDisplay", "Overpass", overpass, helvetica, arial, sans-serif;
-    --pf-global--FontFamily--redhatVF--monospace:
-        "RedHatMonoVF", "RedHatMono", "Liberation Mono", consolas, "SFMono-Regular", menlo, monaco,
-        "Courier New", monospace;
-    --pf-global--FontFamily--overpass--sans-serif:
-        "overpass", overpass, "open sans", -apple-system, blinkmacsystemfont, "Segoe UI", roboto,
-        "Helvetica Neue", arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji",
-        "Segoe UI Symbol";
-    --pf-global--FontFamily--overpass--monospace:
-        "overpass-mono", overpass-mono, "SFMono-Regular", menlo, monaco, consolas,
-        "Liberation Mono", "Courier New", monospace;
-}
+/* #endregion */

web/src/styles/authentik/base/variables.css

@@ -23,6 +23,7 @@
 
 /* #region authentik extensions */
 
+/* #region Root */
 :root {
     --ak-accent: #fd4b2d;
 

web/src/styles/authentik/interface.global.css

@@ -1,9 +1,10 @@
-@import "@patternfly/patternfly/base/patternfly-fonts.css";
+@import "@patternfly/patternfly/base/patternfly-common.css";
 @import "@patternfly/patternfly/base/patternfly-globals.css";
 @import "@patternfly/patternfly/base/patternfly-themes.css";
 @import "@patternfly/patternfly/base/patternfly-fa-icons.css";
 @import "@patternfly/patternfly/base/patternfly-pf-icons.css";
 @import "@patternfly/patternfly/components/Spinner/spinner.css";
+@import "#fonts/RedHat/faces.css";
 @import "./base/fonts.css";
 @import "./base/variables.css";
 @import "./base/scrollbars.css";