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
UI updates - mapwidget change marker on radius - or-map-marker removed hash from color - or-rule-editor-list style improvements - or-header style improvements
robindekkerse857f9397c1b
diff --git a/ui/component/or-header/src/style.ts b/ui/component/or-header/src/style.tsindex 57983b392..dfd197d37 100644--- a/ui/component/or-header/src/style.ts+++ b/ui/component/or-header/src/style.ts@@ -89,7 +89,6 @@ export const style = css`#desktop-right {margin-left: auto;display: none;- margin-left: auto;margin-right: 20px;}@@ -104,7 +103,6 @@ export const style = css`::slotted(*) {opacity: 0.8;cursor: pointer;- text-transform: uppercase;text-decoration: none !important;}diff --git a/ui/component/or-map/src/mapwidget.ts b/ui/component/or-map/src/mapwidget.tsindex f27e401f6..c80824c41 100644--- a/ui/component/or-map/src/mapwidget.ts+++ b/ui/component/or-map/src/mapwidget.ts@@ -253,6 +253,7 @@ export class MapWidget {switch (prop) {case "lat":case "lng":+ case "radius":if (marker.lat && marker.lng) {if (marker._actualMarkerElement) {this._updateMarkerPosition(marker);diff --git a/ui/component/or-map/src/markers/or-map-marker.ts b/ui/component/or-map/src/markers/or-map-marker.tsindex 473c95d85..fa24d46d8 100644--- a/ui/component/or-map/src/markers/or-map-marker.ts+++ b/ui/component/or-map/src/markers/or-map-marker.ts@@ -187,11 +187,11 @@ export class OrMapMarker extends LitElement {protected getColor() {- return this.color && this.color !== "unset" ? "#" + this.color : undefined;+ return this.color && this.color !== "unset" ? this.color : undefined;}protected getActiveColor() {- return this.activeColor && this.activeColor !== "unset" ? "#" + this.activeColor : undefined;+ return this.activeColor && this.activeColor !== "unset" ? this.activeColor : undefined;}protected updateColor(container?: HTMLDivElement) {diff --git a/ui/component/or-rules-editor/src/style.ts b/ui/component/or-rules-editor/src/style.tsindex 942577eeb..13815ce48 100644--- a/ui/component/or-rules-editor/src/style.ts+++ b/ui/component/or-rules-editor/src/style.ts@@ -175,6 +175,9 @@ export const ruleSectionStyle = css`// language=CSSexport const ruleListStyle = css`+ :host {+ overflow: auto;+ }.d-flex {display: -webkit-box;display: -moz-box;@@ -205,7 +208,7 @@ export const ruleListStyle = css`.list-item {text-decoration: none;font-size: 14px;- padding: 13px 0 13px 15px;+ padding: 13px 15px;border-left: 5px solid transparent;color: var(--app-grey-color, #808080);cursor: pointer;