Modifications across all; added Asahi

src/branding/asahi.scss

@@ -0,0 +1,12 @@
+@use "standard.scss" as *;
+
+:root {
+  /*
+  First, optimize the SVG with SVGO; there's a web-based version
+  called SVGOMG at https://jakearchibald.github.io/svgomg/
+
+  Then, encode using URI encoding (not base64) and use as a
+  background. There's a useful tool at https://svgencode.com/
+  */
+  --logo: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' xml:space='preserve' fill-rule='evenodd' stroke-linejoin='round' stroke-miterlimit='2' clip-rule='evenodd' viewBox='0 0 500 525'%3E%3Cg color='%23000' paint-order='stroke markers fill'%3E%3Cpath fill='%232c2c2c' d='M375 125H250v400l134-95-24-65 56 43 84-60Z' overflow='visible'/%3E%3Cpath fill='%23d3506f' d='m0 348 250 177 15-45 6-255-21-48v-12l-100-40h-25z' overflow='visible'/%3E%3Cpath fill='%23a61200' d='m125 125 125-42 59 20-19 17 85 5-125 52' overflow='visible'/%3E%3Cpath fill='%2300a67c' d='M225 50h75L290 0z' overflow='visible'/%3E%3Cpath fill='%23edbb60' d='M250 125V0l-50 25z' overflow='visible'/%3E%3Cpath fill='%23fff' d='m384 430-33-45-101 140V177l166 231Z' overflow='visible'/%3E%3Cpath fill='%2396caf3' d='M290 418V300l43 59z' overflow='visible'/%3E%3Cpath fill='%23530900' d='M250 125h125l-66-22' overflow='visible'/%3E%3C/g%3E%3C/svg%3E");
+}

src/branding/bazzite.scss

@@ -1,6 +1,9 @@
 @use "standard.scss" as *;
 
 :root {
+  /* Defaults to a "Fedora remix"; if not a remix, set "false" */
+  /* --remix: false; */
+
   /*
   Brand colors
   */

src/branding/centos.scss

@@ -1,32 +1,15 @@
 @use "standard.scss" as *;
 
 :root {
-  /* Defaults to a "Fedora remix"; if not a remix, set "none" */
-  --remix: none;
+  /* Defaults to a "Fedora remix"; if not a remix, set "false" */
+  --remix: false;
 
   /*
   Brand colors
   */
   --brand-primary: black;
   --brand-text: white;
 
-  /*
-  Space between the logo and text; default is 0.5em, which is half a character wide
-  --logo-gap: 0.5em;
-  */
-
-  /*
-  Size of the logo
-  */
-  --logo-height: 3rem;
-  --logo-width: 3rem;
-
-  /*
-  In case the logo needs a dropshadow or something similar, you can add
-  a filter here; 'none' also works as an option
-  */
-  --logo-filter: drop-shadow(0 0 6px rgba(0 0 0 / 0.5));
-
   /*
   The actual logo SVG.
 

src/branding/standard.scss

@@ -16,6 +16,10 @@ Standard base theme for customizing the heading
   --_gradient-start: var(--gradient-start, 0%);
   /* Where the gradient stops fading; can be in px, %, rem, or other units */
   --_gradient-stop: var(--gradient-stop, 100%);
+  /* Set logo height default to 3em */
+  --_logo-height: var(--logo-height, 3rem);
+  /* Set logo height default to 3em */
+  --_logo-width: var(--logo-width, 3rem);
 
   /* If there's a background-custom variable use it, otherwise gradient */
 	background: var(--background-custom, linear-gradient(var(--_gradient-angle), var(--_primary) var(--_gradient-start), var(--_secondary) var(--_gradient-stop)));
@@ -54,8 +58,8 @@ Standard base theme for customizing the heading
       */
       content: '';
       display: inline-block;
-      height: var(--logo-height);
-      width: var(--logo-width);
+      height: var(--_logo-height);
+      width: var(--_logo-width);
       min-width: var(--logo-width);
       filter: var(--logo-filter, none);
     }
@@ -85,7 +89,10 @@ Fedora Remix badge
 
 :where(:root) {
   --remix-height: 32px;
-  --remix: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 211.7 106.7'%3E%3Cpath fill='%2351a2da' d='M20.6 65.6H191a20.5 20.5 0 1 1 0 41H20.6a20.5 20.5 0 1 1 0-41z'/%3E%3Cpath fill='%2351a2da' d='M1119.7 46.3v38.4c0 4.8 7.2 4.8 7.2 0V59.1h7.4c1.7 0 3.2-1.2 3.2-3.2s-1.6-3.3-3.2-3.3h-7.4v-5.9c0-3.8 3-6.9 8.9-6.8 2 0 2.8.5 3.6 1 4 2.7 8-3.6 3.7-6a14.5 14.5 0 0 0-8-2.3c-9.4 0-15.3 7.1-15.4 13.7zm94.1-13c-2.3-.1-4 2.1-3.6 4.2V54c-7-6-18.6-5.6-25.2 1a19 19 0 0 0-3 24c3.5 5.6 10 9.6 16.6 9.3a19 19 0 0 0 11.6-4.5c-.3 2 1.3 4.3 3.6 4.2 2.2 0 4-2.1 3.6-4.2V36.5a3.6 3.6 0 0 0-3.6-3.2zm-15.6 23.5c6.4-.1 12.2 5.6 12 12a12 12 0 0 1-24 1 12 12 0 0 1 12-13zm107.5-7.3c-5 0-8.5 1.5-11 3.3-4 2.8.3 8.6 4.2 5.9 1.7-1.3 3-2 6.8-2 4.6 0 8.3 1.8 8.3 5.3-2.5 1.5-13.2 2.8-19 6.1-5.8 3.3-5.5 7.5-5.5 10.2 0 5.9 6.2 9.8 11.6 9.8 5.4 0 7.7-1 13-4.7v1c-.2 5 7.3 5 7.2 0V63.2c0-8.8-6.3-13.6-15.6-13.7zm8.5 19.6v5.3c0 2.8-1.8 4-3.6 5.2-1.8 1-5.6 2-7.7 2-2.5.2-5.9-.4-6-3.4 0-1.8.8-2.9 2.3-4.1 3.3-2.5 7.9-3.4 15-5zM1270 49.6c-3.1 0-3.6 2.6-3.6 3.6v31.3a3.7 3.7 0 1 0 7.4 0V65.4c0-7.5 6-9 8-9 1.6 0 2.9.8 4.1.8 1.9-.1 3.4-1.3 3.4-3.5 0-3.5-4.4-4-7.5-4-3.2.1-5.9 1.1-8.2 2.5 0 0-.5-2.6-3.6-2.6zm-28.4-.3a19.6 19.5 0 0 0-19.6 19.5 19.6 19.5 0 0 0 19.6 19.5 19.6 19.5 0 0 0 19.7-19.5 19.6 19.5 0 0 0-19.7-19.5zm0 7.3a12.3 12.2 0 0 1 12.3 12.2 12.3 12.2 0 0 1-12.3 12.2 12.3 12.2 0 0 1-12.2-12.2 12.3 12.2 0 0 1 12.2-12.2zm-90-5.6c-7 2.7-11.7 9.4-11.7 17.6 0 8.6 6 19.8 18.5 19.8a20 20 0 0 0 15-5.2 3.6 3.6 0 1 0-5-5.2c-1.7 1.6-4.2 4-11.3 3.2-3-.3-6.3-2.8-7.4-4.7l23.2-9.9a3.6 3.6 0 0 0 1.9-4.6c-4.2-8.2-11.5-15.5-23.1-11zm14.7 10.7-19.4 8.3c-1.4-5.2 4.3-11.2 7.4-12.4a10 10 0 0 1 12 4.1z' font-family='Comfortaa' font-weight='700' letter-spacing='0' style='line-height:25px;-inkscape-font-specification:Comfortaa' transform='translate(-1115.3 -32.6)' word-spacing='0'/%3E%3Cpath fill='%23fff' d='M1143.5 108c-1.7 0-2 1.5-2 2.1v17.7c0 1 .9 2 2 2a2 2 0 0 0 2.1-2V117c0-4.2 3.4-5.1 4.6-5.1.9 0 1.6.5 2.3.5a2 2 0 0 0 1.9-2c0-2-2.5-2.2-4.2-2.2-1.8 0-3.3.6-4.6 1.4 0 0-.3-1.5-2-1.5zm34 .9c-4 1.5-6.6 5.2-6.6 9.8 0 4.9 3.4 11 10.4 11.1 4.7 0 7-1.7 8.3-3a2 2 0 1 0-2.8-2.8c-.9.9-2.3 2.2-6.3 1.8a6.3 6.3 0 0 1-4-2.7l12.9-5.5a2 2 0 0 0 1-2.6c-2.3-4.5-6.4-8.6-12.9-6.1zm8.1 6-10.8 4.6c-.7-2.9 2.4-6.3 4.2-6.9 2.5-1 5.4.1 6.6 2.3zm77.6-6.8q2 .5 2 2v17.8q0 1.6-2 2h-.1q-1.7 0-2-2v-17.5q.2-2.3 2-2.3zm-51.9.5q1.5 0 2 1.3 1.5-1.3 4.6-1.3 4 0 6.6 3 .8-1.6 4.8-2.7l1.7-.3q5 0 7.8 4.7 1 2 1 3.8v11q0 1.4-2 1.8h-.1q-2-.4-2-2v-10.6q0-3.2-3.3-4.4l-1-.2h-.6q-2.7 0-4 3.2-.3.6-.3 1v11q-.3 2-2 2-2-.4-2-2v-9q0-3.4-.9-4.2-1.4-2-3.6-2h-.3q-3 0-4.3 3.3-.2.8-.2 2.2v9.8q0 1.5-2 1.9-1.6 0-2-2v-17q.2-2.3 2.1-2.3zm81.6 7.5 5.6-7q.4-.3 1.4-.5 2 .5 2 1.8v.5q0 .7-2.8 3.9l-3.6 4.5q6.4 7.6 6.4 8.2v.5q0 1.5-2 1.9-1.3 0-2.5-2l-4.5-5.4q-5.4 6.8-5.8 7-.5.4-1 .4h-.1q-1.7 0-2-2.1 0-.9 3-4.2l3.3-4.4-6.1-7.7-.2-.8q.4-2 2-2 1.3 0 2.8 2.3l4.1 5z' color='%23000' font-family='sans-serif' font-weight='400' overflow='visible' style='line-height:normal;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:%23000;text-transform:none;text-orientation:mixed;white-space:normal;shape-padding:0;isolation:auto;mix-blend-mode:normal;solid-color:%23000;solid-opacity:1' transform='translate(-1115.3 -32.6)'/%3E%3C/svg%3E");
+  --remix-color: #949494;
+  --remix-color-dark: #4c4c4c;
+
+  --remix-logo: var(--remix, url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 71.43 36'%3E%3Cpath fill='%23151515' d='M1.5 4.62v12.96c0 1.6 2.43 1.6 2.43 0V8.93h2.5c.58 0 1.07-.42 1.07-1.1 0-.68-.53-1.09-1.08-1.09h-2.5V4.75c0-1.28 1-2.34 3.01-2.31.7 0 .95.18 1.2.33 1.4.92 2.74-1.21 1.28-2.03A4.9 4.9 0 0 0 6.68 0C3.54 0 1.52 2.39 1.5 4.62ZM33.26.23c-.76-.04-1.32.7-1.2 1.42v5.52a6.5 6.5 0 0 0-8.53.36 6.44 6.44 0 0 0-1.03 8.1 6.57 6.57 0 0 0 5.64 3.12 6.38 6.38 0 0 0 3.91-1.53c-.1.71.44 1.47 1.2 1.42.76.04 1.34-.7 1.22-1.42-.01-5.3.01-10.61-.01-15.92A1.2 1.2 0 0 0 33.25.23Zm-5.27 7.93a4.1 4.1 0 0 1 4.06 4.04 4.06 4.06 0 0 1-8.1.3 4.07 4.07 0 0 1 4.04-4.34zm36.27-2.47a6.2 6.2 0 0 0-3.72 1.11c-1.31.95.1 2.92 1.42 1.98.6-.43 1.05-.66 2.3-.66 1.56.03 2.81.62 2.81 1.78-.83.53-4.47.97-6.42 2.08-1.95 1.1-1.84 2.5-1.84 3.41 0 2 2.1 3.34 3.92 3.34 1.81 0 2.59-.38 4.37-1.6v.35c-.06 1.67 2.48 1.67 2.43 0v-7.15c0-2.97-2.12-4.6-5.27-4.64zm2.9 6.6-.01 1.8c-.01.94-.6 1.38-1.22 1.74-.62.36-1.89.68-2.62.72-.84.02-1.96-.17-2.02-1.17 0-.6.3-.97.78-1.4 1.13-.84 2.67-1.13 5.09-1.69zM52.2 5.72c-1.05 0-1.23.87-1.22 1.22v10.54c-.03.69.53 1.25 1.24 1.25.7 0 1.27-.56 1.24-1.25 0 0 .02-3.92 0-6.43A2.83 2.83 0 0 1 56.2 8c.52 0 .95.29 1.36.27.63-.02 1.14-.44 1.14-1.17-.02-1.18-1.47-1.34-2.54-1.32a5.49 5.49 0 0 0-2.75.81s-.16-.87-1.21-.87zm-9.58-.09A6.63 6.57 0 0 0 36 12.21a6.63 6.57 0 0 0 6.63 6.57 6.63 6.57 0 0 0 6.63-6.57 6.63 6.57 0 0 0-6.63-6.58zm0 2.47a4.14 4.11 0 0 1 4.15 4.1 4.14 4.11 0 0 1-4.15 4.12 4.14 4.11 0 0 1-4.14-4.11 4.14 4.11 0 0 1 4.14-4.11zM12.26 6.19a6.25 6.25 0 0 0-4 5.95c0 2.9 2.04 6.67 6.27 6.7 2.84.01 4.26-1.05 5.03-1.77a1.2 1.2 0 1 0-1.66-1.76c-.57.54-1.41 1.34-3.8 1.07a3.8 3.8 0 0 1-2.5-1.58l7.84-3.33c.6-.27.87-.96.62-1.57-1.4-2.75-3.88-5.23-7.8-3.71zm4.92 3.62-6.53 2.79c-.46-1.74 1.45-3.79 2.49-4.17a3.36 3.36 0 0 1 4.04 1.38zM6.94 22.13A6.92 6.92 0 0 0 0 29.06C0 32.91 3.1 36 6.94 36H64.5c3.84 0 6.93-3.1 6.93-6.94a6.91 6.91 0 0 0-6.93-6.93zm2.6 3.33c.6 0 .69.5.69.5a3.1 3.1 0 0 1 1.55-.46c.6-.02 1.42.08 1.43.74 0 .42-.3.65-.64.66-.24.01-.47-.15-.77-.15-.4 0-1.56.3-1.55 1.72.02 1.42 0 3.63 0 3.63.02.38-.3.7-.7.7a.69.69 0 0 1-.7-.7v-5.95c0-.2.1-.69.7-.69zm12.61.02c1.54-.07 2.58 1.08 3.21 2.33a.67.67 0 0 1-.35.87l-4.37 1.86c.2.36.82.82 1.4.88 1.33.15 1.8-.3 2.12-.6a.67.67 0 1 1 .92.99c-.42.4-1.22 1-2.8.98-2.36-.01-3.5-2.1-3.5-3.73a3.5 3.5 0 0 1 3.37-3.58zm27.78 0c.44.11.66.32.66.63v6.04c0 .36-.22.59-.67.66h-.04c-.37 0-.6-.23-.68-.69v-5.88c.05-.5.3-.76.73-.76zm12.38.15c.45.1.67.32.67.63v.15c0 .15-.31.59-.93 1.31l-1.22 1.53c1.44 1.72 2.15 2.64 2.15 2.77v.15c0 .35-.22.57-.66.64h-.03c-.27 0-.54-.21-.82-.64l-1.5-1.86a44.16 44.16 0 0 1-1.97 2.4.67.67 0 0 1-.36.1h-.02c-.38 0-.6-.23-.67-.7 0-.2.33-.66.99-1.4l1.14-1.48-2.07-2.6-.07-.3c.1-.46.33-.7.7-.7.27 0 .58.27.93.8.73.88 1.2 1.46 1.4 1.73.23-.28.86-1.05 1.87-2.33a.9.9 0 0 1 .47-.2zm-29.9 0c.34 0 .56.16.65.45.37-.3.9-.44 1.58-.44.92 0 1.66.34 2.22 1.02.19-.36.73-.67 1.62-.94l.6-.08c1.1 0 1.99.53 2.63 1.59.21.44.32.87.32 1.27v3.7c0 .32-.22.53-.65.61h-.06c-.44-.07-.65-.3-.65-.67v-3.58c0-.72-.38-1.21-1.14-1.49l-.3-.04h-.24c-.6 0-1.05.35-1.37 1.05a1.5 1.5 0 0 0-.06.38v3.68c-.08.45-.3.67-.67.67h-.05c-.43-.07-.65-.3-.65-.64v-3.05c0-.78-.1-1.26-.29-1.44a1.48 1.48 0 0 0-1.24-.65h-.07c-.7 0-1.18.37-1.46 1.12-.05.18-.07.42-.07.73v3.29c0 .35-.22.57-.65.64h-.04c-.36 0-.59-.22-.67-.67V26.4c.05-.5.28-.76.72-.76zm-10.25 1.24c-.22 0-.44.04-.66.12-.58.21-1.65 1.35-1.39 2.32l3.64-1.55a1.84 1.84 0 0 0-1.59-.89Z'/%3E%3C/svg%3E"));
 }
 
 .pf-v5-c-wizard__footer {
@@ -101,7 +108,9 @@ Fedora Remix badge
     Use the value you get to set --logo in your disto customization
     file, as a CSS variable. The CSS here will do the rest.
     */
-    background: var(--remix) center right no-repeat;
+    background: var(--remix, var(--remix-color));
+
+    mask: var(--remix, var(--remix-logo)) center right no-repeat;
 
     /*
     Make the logo visible and have it fill the space vertically,
@@ -113,7 +122,10 @@ Fedora Remix badge
     /* Difference between PF button height (36px) and the graphic */
     margin-block-start: calc((36px - var(--remix-height)) / 2);
     pointer-events: none;
-    filter: grayscale(1) brightness(1.33);
     flex: auto;
   }
+
+  .pf-v5-theme-dark & {
+    --remix-color: var(--remix-color-dark);
+  }
 }

src/components/app.scss

@@ -2,6 +2,7 @@
 
 // FIXME: Make this automatically distro-specific
 /* @import "../branding/fedora"; */
+/* @import "../branding/asahi"; */
 /* @import "../branding/centos"; */
 @import "../branding/bazzite";