100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps
Java asset-managementbuildingdashboarddataplatformdevice-managementedge-computingenergyenergy-managementenergy-monitorfleet-managementfleet-telematicsiotiot-applicationiot-platformmodbusmqttmqtt-brokerota-updaterules-enginesmartcity
Remove or-vaadin-icon component (#2904)
Koen0ed159ba423d
diff --git a/ui/component/or-scheduler/src/index.ts b/ui/component/or-scheduler/src/index.tsindex 1df84eb33..2b2f89bec 100644--- a/ui/component/or-scheduler/src/index.ts+++ b/ui/component/or-scheduler/src/index.ts@@ -25,7 +25,6 @@ import "@openremote/or-vaadin-components/or-vaadin-checkbox-group";import "@openremote/or-vaadin-components/or-vaadin-date-picker";import "@openremote/or-vaadin-components/or-vaadin-date-time-picker";import "@openremote/or-vaadin-components/or-vaadin-dialog";-import "@openremote/or-vaadin-components/or-vaadin-icon";import "@openremote/or-vaadin-components/or-vaadin-number-field";import "@openremote/or-vaadin-components/or-vaadin-radio-group";import "@openremote/or-vaadin-components/or-vaadin-select";@@ -437,7 +436,7 @@ export class OrScheduler extends translate(i18next)(LitElement) {protected _getDialogHeader(): TemplateResult {return html`<vaadin-button theme="tertiary" @click="${this._onClose}">- <vaadin-icon icon="lumo:cross"></vaadin-icon>+ <or-icon icon="mdi:close"></or-icon></vaadin-button>`;}diff --git a/ui/component/or-vaadin-components/package.json b/ui/component/or-vaadin-components/package.jsonindex 1747d11ee..9bbb0103b 100644--- a/ui/component/or-vaadin-components/package.json+++ b/ui/component/or-vaadin-components/package.json@@ -38,8 +38,6 @@"@vaadin/date-picker": "~25.1.4","@vaadin/date-time-picker": "~25.1.4","@vaadin/dialog": "~25.1.4",- "@vaadin/icon": "~25.1.4",- "@vaadin/icons": "~25.1.4","@vaadin/item": "~25.1.4","@vaadin/list-box": "~25.1.4","@vaadin/menu-bar": "~25.1.4",diff --git a/ui/component/or-vaadin-components/src/or-vaadin-icon.ts b/ui/component/or-vaadin-components/src/or-vaadin-icon.tsdeleted file mode 100644index 350b8da60..000000000--- a/ui/component/or-vaadin-components/src/or-vaadin-icon.ts+++ /dev/null@@ -1,27 +0,0 @@-/*- * Copyright 2025, OpenRemote Inc.- *- * See the CONTRIBUTORS.txt file in the distribution for a- * full listing of individual contributors.- *- * This program is free software: you can redistribute it and/or modify- * it under the terms of the GNU Affero General Public License as- * published by the Free Software Foundation, either version 3 of the- * License, or (at your option) any later version.- *- * This program is distributed in the hope that it will be useful,- * but WITHOUT ANY WARRANTY; without even the implied warranty of- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the- * GNU Affero General Public License for more details.- *- * You should have received a copy of the GNU Affero General Public License- * along with this program. If not, see <http://www.gnu.org/licenses/>.- */-import { customElement } from "lit/decorators.js";-import { Icon } from "@vaadin/icon";-import { OrVaadinComponent } from "./util";-import "@vaadin/icons";-import "@vaadin/vaadin-lumo-styles/vaadin-iconset.js";--@customElement("or-vaadin-icon")-export class OrVaadinIcon extends Icon implements OrVaadinComponent {}diff --git a/ui/component/theme/src/components/index.css b/ui/component/theme/src/components/index.cssindex bbc6f6735..bb38f7847 100644--- a/ui/component/theme/src/components/index.css+++ b/ui/component/theme/src/components/index.css@@ -29,7 +29,6 @@@import "./or-vaadin-date-time-picker.css";@import "./or-vaadin-date-picker.css"; /* Must be after the date-time-picker */@import "./or-vaadin-dialog.css";-@import "./or-vaadin-icon.css";@import "./or-vaadin-item.css";@import "./or-vaadin-list-box.css";@import "./or-vaadin-menu-bar.css";diff --git a/ui/component/theme/src/components/or-vaadin-icon.css b/ui/component/theme/src/components/or-vaadin-icon.cssdeleted file mode 100644index 4f8f35609..000000000--- a/ui/component/theme/src/components/or-vaadin-icon.css+++ /dev/null@@ -1,26 +0,0 @@-/*- * Copyright 2025, OpenRemote Inc.- *- * See the CONTRIBUTORS.txt file in the distribution for a- * full listing of individual contributors.- *- * This program is free software: you can redistribute it and/or modify- * it under the terms of the GNU Affero General Public License as- * published by the Free Software Foundation, either version 3 of the- * License, or (at your option) any later version.- *- * This program is distributed in the hope that it will be useful,- * but WITHOUT ANY WARRANTY; without even the implied warranty of- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the- * GNU Affero General Public License for more details.- *- * You should have received a copy of the GNU Affero General Public License- * along with this program. If not, see <http://www.gnu.org/licenses/>.- */-@import "@vaadin/vaadin-lumo-styles/components/icon.css";--:root::before,-:host::before {- --_lumo-vaadin-icon-inject: 1;- --_lumo-vaadin-icon-inject-modules: lumo_components_icon;-}diff --git a/yarn.lock b/yarn.lockindex c9faa061d..c9bf70b18 100644--- a/yarn.lock+++ b/yarn.lock@@ -2308,8 +2308,6 @@ __metadata:"@vaadin/date-picker": "npm:~25.1.4""@vaadin/date-time-picker": "npm:~25.1.4""@vaadin/dialog": "npm:~25.1.4"- "@vaadin/icon": "npm:~25.1.4"- "@vaadin/icons": "npm:~25.1.4""@vaadin/item": "npm:~25.1.4""@vaadin/list-box": "npm:~25.1.4""@vaadin/menu-bar": "npm:~25.1.4"@@ -4066,15 +4064,6 @@ __metadata:languageName: nodelinkType: hard-"@vaadin/icons@npm:~25.1.4":- version: 25.1.4- resolution: "@vaadin/icons@npm:25.1.4"- dependencies:- "@vaadin/icon": "npm:~25.1.4"- checksum: 10c0/b1a48ffaf02a19b0e34b25310cad985b2b2ac8eb9f0999bdfc6bfbcb2de0e3f2538cb921ce0f4d8bca734902baea6fa9c87219a7a6d3b6fb67bce48172cc0466- languageName: node- linkType: hard-"@vaadin/input-container@npm:~25.1.4":version: 25.1.4resolution: "@vaadin/input-container@npm:25.1.4"