diff --git a/src/components/ConfigurationPage/widgetsettings/DonatersTopListWidgetSettings.tsx b/src/components/ConfigurationPage/widgetsettings/DonatersTopListWidgetSettings.tsx index 9123d97..5f7c818 100644 --- a/src/components/ConfigurationPage/widgetsettings/DonatersTopListWidgetSettings.tsx +++ b/src/components/ConfigurationPage/widgetsettings/DonatersTopListWidgetSettings.tsx @@ -1,3 +1,4 @@ +import { AnimatedFontProperty } from "../widgetproperties/AnimatedFontProperty"; import { ColorProperty } from "../widgetproperties/ColorProperty"; import { DonatersTopListLayoutProperty } from "../widgetproperties/DonatersTopListLayoutProperty"; import { FontProperty } from "../widgetproperties/FontProperty"; @@ -52,46 +53,16 @@ export class DonatersTopListWidgetSettings extends AbstractWidgetSettings { "widget-donaterslist-title", "header", ), - new FontProperty( - widgetId, - "titleFont", - "fontselect", - "Roboto", - "widget-donaterslist-title-font-family", - "header", - ), - new FontProperty( - widgetId, - "font", - "fontselect", - "Roboto", - "widget-donaterslist-list-font-family", - "list", - ), - new NumberProperty( - widgetId, - "titleFontSize", - "number", - "24", - "widget-donaterslist-title-font-size", - "header", - ), - new NumberProperty( - widgetId, - "fontSize", - "number", - "24", - "widget-donaterslist-list-font-size", - "list", - ), - new ColorProperty( - widgetId, - "titleColor", - "color", - "#ffffff", - "widget-donaterslist-title-color", - "header", - ), + new AnimatedFontProperty({ + widgetId: widgetId, + name: "headerFont", + tab: "header" + }), + new AnimatedFontProperty({ + widgetId: widgetId, + name: "messageFont", + tab: "list" + }), new ColorProperty( widgetId, "titleBackgroundColor", @@ -100,14 +71,6 @@ export class DonatersTopListWidgetSettings extends AbstractWidgetSettings { "widget-donaterslist-title-background-color", "header", ), - new ColorProperty( - widgetId, - "color", - "color", - "#ffffff", - "widget-donaterslist-list-color", - "list", - ), new ColorProperty( widgetId, "backgroundColor", @@ -116,22 +79,6 @@ export class DonatersTopListWidgetSettings extends AbstractWidgetSettings { "widget-donaterslist-list-background-color", "list", ), - new NumberProperty( - widgetId, - "titleAlphaChannel", - "number", - "1.0", - "widget-donaterslist-title-transparency", - "header", - ), - new NumberProperty( - widgetId, - "alphaChannel", - "number", - "1.0", - "widget-donaterslist-list-transparency", - "list", - ), new DonatersTopListLayoutProperty(widgetId, "vertical"), ], tabs, diff --git a/src/components/DonatersTopList/DonatersTopList.tsx b/src/components/DonatersTopList/DonatersTopList.tsx index 5b21cbf..6d06776 100644 --- a/src/components/DonatersTopList/DonatersTopList.tsx +++ b/src/components/DonatersTopList/DonatersTopList.tsx @@ -4,8 +4,14 @@ import axios from "axios"; import "./DonatersTopList.css"; import { useLoaderData, useNavigate } from "react-router"; import { findSetting } from "../utils"; -import { cleanupCommandListener, setupCommandListener, subscribe, unsubscribe } from "../../socket"; +import { + cleanupCommandListener, + setupCommandListener, + subscribe, + unsubscribe, +} from "../../socket"; import FontImport from "../FontImport/FontImport"; +import { AnimatedFontProperty } from "../ConfigurationPage/widgetproperties/AnimatedFontProperty"; const overflowHiddenForRootElement = (