From 5663a205df801137b2d4ed26795edfdee5ab21de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=81lvaro=20Velad=20Galv=C3=A1n?= <ladvan91@hotmail.com>
Date: Wed, 4 Sep 2024 07:20:50 +0200
Subject: [PATCH] fix(UI): Fix font-family override in UITextDisplayer (#7249)

Font settings were applied to ".shaka-video-container *", all
descendents of .shaka-video-container. This meant that the font setting
inheritance intended in our UI text displayer was broken, because those
descendents effectively had their own settings and didn't inherit them
from their parents in the subtitle DOM hierarchy. We fix this by
breaking down the CSS and applying those font settings directly to the
top level .shaka-video-container, to be inherited by any descendent
without their own setting.
---
 lib/text/ui_text_displayer.js | 4 ----
 ui/less/containers.less       | 7 +++----
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/lib/text/ui_text_displayer.js b/lib/text/ui_text_displayer.js
index fcbe8d7cbe..3c9c0974c4 100644
--- a/lib/text/ui_text_displayer.js
+++ b/lib/text/ui_text_displayer.js
@@ -710,10 +710,6 @@ shaka.text.UITextDisplayer = class {
           // Only do this for the text itself.
           elem.style.backgroundColor = 'rgba(0, 0, 0, 0.8)';
         }
-        const fontFamily = inherit((c) => c.fontFamily);
-        if (fontFamily) {
-          elem.style.fontFamily = fontFamily;
-        }
       }
       if (text) {
         elem.textContent = text;
diff --git a/ui/less/containers.less b/ui/less/containers.less
index fa51e9e535..06a88b7f5d 100644
--- a/ui/less/containers.less
+++ b/ui/less/containers.less
@@ -22,10 +22,9 @@
   }
 
   /* Set the fonts for all other content. */
-  * {
-    font-family: Roboto, sans-serif, TengwarTelcontar;
-    -webkit-font-smoothing: antialiased;
-  }
+  font-family: Roboto, sans-serif, TengwarTelcontar;
+  font-weight: normal;
+  -webkit-font-smoothing: antialiased;
 }
 
 /* Each browser has a different prefixed pseudo-class for fullscreened elements.