make countdown font configigurable

Author: reloxx13

assets/sass/components/_background.scss

@@ -7,7 +7,7 @@
   display: flex;
   align-items: center;
   justify-content: center;
-  background-color: var(--countdown-color);
+  background-color: var(--countdown-font-color);
 
   & video {
     width: 100%;

assets/sass/components/_countdown.scss

@@ -9,7 +9,10 @@
   height: 100%;
   width: 100%;
   overflow: hidden;
-  color: var(--countdown-color);
+  color: var(--countdown-font-color);
+  font-family: var(--font-family-countdown, --font-family-default), 'Dosis', sans-serif;
+  font-weight: var(--countdown-font-weight, 700);
+  font-style: var(--countdown-font-style, normal);
   display: flex;
   justify-content: center;
   align-items: center;

assets/sass/components/_reboot.scss

@@ -9,7 +9,7 @@
 
 body {
   margin: 0;
-  font-family: var(--font-family);
+  font-family: var(--font-family-default, --font-family), sans-serif;
   font-size: 1rem;
   font-weight: 400;
   line-height: 1.5;

assets/sass/components/_root.scss

@@ -14,7 +14,7 @@
   --secondary-font-color: transparent;
   --button-font-color: transparent;
   --start-text-color: transparent;
-  --countdown-color: transparent;
+  --countdown-font-color: transparent;
   --background-countdown-color: transparent;
   --cheese-color: transparent;
   --panel-color: transparent;
@@ -26,7 +26,7 @@
   --background-admin: none;
   --background-chroma: none;
   --background-preview: none;
-  --font-family: 'DefaultFont', 'Dosis', sans-serif;
+  --font-family: 'Dosis', sans-serif;
   --font-color: transparent;
   --preview-rotation: 0deg;
   --ui-scale-result: contain;

lib/configsetup.inc.php

@@ -2898,14 +2898,6 @@
             'name' => 'ui[result_buttons]',
             'value' => $config['ui']['result_buttons'],
         ],
-        'colors_countdown' => [
-            'view' => 'advanced',
-            'type' => 'color',
-            'name' => 'colors[countdown]',
-            'data-theme-field' => 'true',
-            'placeholder' => $defaultConfig['colors']['countdown'],
-            'value' => $config['colors']['countdown'],
-        ],
         'colors_background_countdown' => [
             'view' => 'advanced',
             'type' => 'color',
@@ -3479,6 +3471,40 @@
             'placeholder'      => $defaultConfig['fonts']['event_text_color'],
             'value'            => $config['fonts']['event_text_color'] ?? '',
         ],
+        'fonts_countdown_text'            => [
+            'view'             => 'basic',
+            'type'             => 'font',
+            'name'             => 'fonts[countdown_text]',
+            'data-theme-field' => 'true',
+            'placeholder'      => $defaultConfig['fonts']['countdown_text'],
+            'value'            => htmlentities($config['fonts']['countdown_text'] ?? ''),
+            'paths'            => [
+                PathUtility::getAbsolutePath('resources/fonts'),
+                PathUtility::getAbsolutePath('private/fonts'),
+            ],
+        ],
+        'fonts_countdown_text_bold'       => [
+            'view'             => 'basic',
+            'type'             => 'checkbox',
+            'name'             => 'fonts[countdown_text_bold]',
+            'data-theme-field' => 'true',
+            'value'            => $config['fonts']['countdown_text_bold'],
+        ],
+        'fonts_countdown_text_italic'     => [
+            'view'             => 'basic',
+            'type'             => 'checkbox',
+            'name'             => 'fonts[countdown_text_italic]',
+            'data-theme-field' => 'true',
+            'value'            => $config['fonts']['countdown_text_italic'],
+        ],
+        'fonts_countdown_text_color'      => [
+            'view'             => 'basic',
+            'type'             => 'color',
+            'name'             => 'fonts[countdown_text_color]',
+            'data-theme-field' => 'true',
+            'placeholder'      => $defaultConfig['fonts']['countdown_text_color'],
+            'value'            => $config['fonts']['countdown_text_color'] ?? '',
+        ],
         'fonts_gallery_title'             => [
             'view'             => 'basic',
             'type'             => 'font',

resources/lang/de.json

@@ -497,6 +497,10 @@
   "fonts:fonts_event_text_bold": "Event fett",
   "fonts:fonts_event_text_italic": "Event kursiv",
   "fonts:fonts_event_text_color": "Event Farbe",
+  "fonts:fonts_countdown_text": "Countdown-Schrift",
+  "fonts:fonts_countdown_text_bold": "Countdown fett",
+  "fonts:fonts_countdown_text_italic": "Countdown kursiv",
+  "fonts:fonts_countdown_text_color": "Countdown Farbe",
   "fonts:fonts_gallery_title": "Galerie-Schrift",
   "fonts:fonts_gallery_title_bold": "Galerie fett",
   "fonts:fonts_gallery_title_italic": "Galerie kursiv",
@@ -525,6 +529,10 @@
   "manual:fonts:fonts_event_text_bold": "Event-Text fett darstellen.",
   "manual:fonts:fonts_event_text_italic": "Event-Text kursiv darstellen.",
   "manual:fonts:fonts_event_text_color": "Farbe für Event-Text.",
+  "manual:fonts:fonts_countdown_text": "Pfad für Countdown-Text.",
+  "manual:fonts:fonts_countdown_text_bold": "Countdown-Text fett setzen.",
+  "manual:fonts:fonts_countdown_text_italic": "Countdown-Text kursiv setzen.",
+  "manual:fonts:fonts_countdown_text_color": "Farbe für Countdown-Text.",
   "manual:fonts:fonts_gallery_title": "Pfad für Galerie-Titel.",
   "manual:fonts:fonts_gallery_title_bold": "Galerie-Titel fett darstellen.",
   "manual:fonts:fonts_gallery_title_italic": "Galerie-Titel kursiv darstellen.",

resources/lang/en.json

@@ -489,6 +489,10 @@
   "fonts:fonts_event_text_bold": "Event bold",
   "fonts:fonts_event_text_italic": "Event italic",
   "fonts:fonts_event_text_color": "Event color",
+  "fonts:fonts_countdown_text": "Countdown font",
+  "fonts:fonts_countdown_text_bold": "Countdown bold",
+  "fonts:fonts_countdown_text_italic": "Countdown italic",
+  "fonts:fonts_countdown_text_color": "Countdown color",
   "fonts:fonts_gallery_title": "Gallery font",
   "fonts:fonts_gallery_title_bold": "Gallery bold",
   "fonts:fonts_gallery_title_italic": "Gallery italic",
@@ -517,6 +521,10 @@
   "manual:fonts:fonts_event_text_bold": "Use bold for event text.",
   "manual:fonts:fonts_event_text_italic": "Use italic for event text.",
   "manual:fonts:fonts_event_text_color": "Color for event text.",
+  "manual:fonts:fonts_countdown_text": "Path for countdown text.",
+  "manual:fonts:fonts_countdown_text_bold": "Use bold for countdown text.",
+  "manual:fonts:fonts_countdown_text_italic": "Use italic for countdown text.",
+  "manual:fonts:fonts_countdown_text_color": "Color for countdown text.",
   "manual:fonts:fonts_gallery_title": "Path for gallery title.",
   "manual:fonts:fonts_gallery_title_bold": "Use bold for gallery title.",
   "manual:fonts:fonts_gallery_title_italic": "Use italic for gallery title.",

src/Configuration/Section/ColorsConfiguration.php

@@ -12,7 +12,6 @@ public static function getNode(): NodeDefinition
         return (new TreeBuilder('colors'))->getRootNode()->addDefaultsIfNotSet()
             ->ignoreExtraKeys()
             ->children()
-                ->scalarNode('countdown')->defaultValue('#1b3faa')->end()
                 ->scalarNode('background_countdown')->defaultValue('#8d9fd4')->end()
                 ->scalarNode('cheese')->defaultValue('#aa1b3f')->end()
                 ->scalarNode('primary')->defaultValue('#1b3faa')->end()

src/Configuration/Section/FontsConfiguration.php

@@ -25,6 +25,10 @@ public static function getNode(): NodeDefinition
             ->booleanNode('event_text_bold')->defaultTrue()->end()
             ->booleanNode('event_text_italic')->defaultFalse()->end()
             ->scalarNode('event_text_color')->defaultValue('#c9c9c9')->end()
+            ->scalarNode('countdown_text')->defaultValue('')->end()
+            ->booleanNode('countdown_text_bold')->defaultTrue()->end()
+            ->booleanNode('countdown_text_italic')->defaultFalse()->end()
+            ->scalarNode('countdown_text_color')->defaultValue('#1b3faa')->end()
             ->scalarNode('gallery_title')->defaultValue('')->end()
             ->booleanNode('gallery_title_bold')->defaultFalse()->end()
             ->booleanNode('gallery_title_italic')->defaultFalse()->end()

src/Service/ConfigurationService.php

@@ -222,6 +222,11 @@ protected function processMigration(array $config): array
             $config['fonts']['button_font_color'] = $config['colors']['button_font'];
         }
 
+        // Migrate countdown color from colors to fonts section
+        if (!empty($config['colors']['countdown']) && empty($config['fonts']['countdown_text_color'])) {
+            $config['fonts']['countdown_text_color'] = $config['colors']['countdown'];
+        }
+
         // Migrate start font color to new font slots if empty
         if (!empty($config['colors']['start_font'])) {
             if (empty($config['fonts']['start_screen_title_color'])) {