diff --git a/lib/Dashboard/TalkWidget.php b/lib/Dashboard/TalkWidget.php index 56e560db9c..798697519f 100644 --- a/lib/Dashboard/TalkWidget.php +++ b/lib/Dashboard/TalkWidget.php @@ -140,7 +140,7 @@ class TalkWidget implements IAPIWidget, IIconWidget, IButtonWidget, IOptionWidge */ #[\Override] public function load(): void { - Util::addStyle('spreed', 'icons'); + Util::addStyle('spreed', 'talk-icons'); } #[\Override] diff --git a/lib/Files/TemplateLoader.php b/lib/Files/TemplateLoader.php index e143c79def..607aa2af8b 100644 --- a/lib/Files/TemplateLoader.php +++ b/lib/Files/TemplateLoader.php @@ -77,7 +77,7 @@ class TemplateLoader implements IEventListener { return; } - Util::addStyle(Application::APP_ID, 'icons'); + Util::addStyle(Application::APP_ID, 'talk-icons'); if (!str_starts_with($this->request->getPathInfo(), '/apps/maps')) { Util::addScript(Application::APP_ID, 'talk-files-sidebar'); Util::addStyle(Application::APP_ID, 'talk-files-sidebar'); diff --git a/lib/PublicShare/TemplateLoader.php b/lib/PublicShare/TemplateLoader.php index b76790f015..c888e3b318 100644 --- a/lib/PublicShare/TemplateLoader.php +++ b/lib/PublicShare/TemplateLoader.php @@ -74,7 +74,7 @@ class TemplateLoader implements IEventListener { return; } - Util::addStyle(Application::APP_ID, 'icons'); + Util::addStyle(Application::APP_ID, 'talk-icons'); Util::addScript(Application::APP_ID, 'talk-public-share-sidebar'); Util::addStyle(Application::APP_ID, 'talk-public-share-sidebar'); diff --git a/lib/PublicShareAuth/TemplateLoader.php b/lib/PublicShareAuth/TemplateLoader.php index 120154ca7e..fa8f48b9b6 100644 --- a/lib/PublicShareAuth/TemplateLoader.php +++ b/lib/PublicShareAuth/TemplateLoader.php @@ -69,7 +69,7 @@ class TemplateLoader implements IEventListener { return; } - Util::addStyle(Application::APP_ID, 'icons'); + Util::addStyle(Application::APP_ID, 'talk-icons'); Util::addScript(Application::APP_ID, 'talk-public-share-auth-sidebar'); Util::addStyle(Application::APP_ID, 'talk-public-share-auth-sidebar'); diff --git a/css/icons.css b/src/icons.css similarity index 100% rename from css/icons.css rename to src/icons.css diff --git a/templates/index.php b/templates/index.php index 9cde0a0d48..79db43716f 100644 --- a/templates/index.php +++ b/templates/index.php @@ -8,4 +8,4 @@ declare(strict_types=1); \OCP\Util::addScript('spreed', 'talk-main'); \OCP\Util::addStyle('spreed', 'talk-main'); -style('spreed', 'icons'); +style('spreed', 'talk-icons'); diff --git a/templates/recording.php b/templates/recording.php index bcebc32dab..7dc17c0ef9 100644 --- a/templates/recording.php +++ b/templates/recording.php @@ -8,4 +8,4 @@ declare(strict_types=1); \OCP\Util::addScript('spreed', 'talk-recording'); \OCP\Util::addStyle('spreed', 'talk-recording'); -style('spreed', 'icons'); +style('spreed', 'talk-icons'); diff --git a/webpack.config.js b/webpack.config.js index d0f28a0817..1a646ce40e 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -35,6 +35,7 @@ module.exports = mergeWithRules({ deck: path.join(__dirname, 'src', 'deck.js'), maps: path.join(__dirname, 'src', 'maps.js'), search: path.join(__dirname, 'src', 'search.js'), + icons: path.join(__dirname, 'src', 'icons.css'), }, output: {