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
fix alignment on several pages (#1457)
DonWillems5d506377d802
diff --git a/ui/app/manager/src/pages/page-configuration.ts b/ui/app/manager/src/pages/page-configuration.tsindex d48c6d1b3..41266d76c 100644--- a/ui/app/manager/src/pages/page-configuration.ts+++ b/ui/app/manager/src/pages/page-configuration.ts@@ -66,7 +66,7 @@ export class PageConfiguration extends Page<AppStateKeyed> {--or-collapisble-panel-background-color: #fff;--or-panel-background-color: #fff;- --or-panel-padding: 18px 24px 24px;+ --or-panel-padding: 12px 24px 24px;--or-panel-heading-margin: 0 0 10px 0;--or-panel-background-color: var(--or-app-color1, ${unsafeCSS(DefaultColor1)});--or-panel-heading-font-size: 14px;diff --git a/ui/app/manager/src/pages/page-gateway.ts b/ui/app/manager/src/pages/page-gateway.tsindex 55a903992..428f1cec7 100644--- a/ui/app/manager/src/pages/page-gateway.ts+++ b/ui/app/manager/src/pages/page-gateway.ts@@ -58,13 +58,14 @@ export class PageGateway extends Page<AppStateKeyed> {}#title {- margin: 20px auto 0;- max-width: 1360px;- width: 100%;display: flex;- justify-content: space-between;+ width: calc(100% - 40px);+ max-width: 1360px;+ padding: 0px 20px;+ flex-direction: row;align-items: center;- color: var(--or-app-color3, ${unsafeCSS(DefaultColor3)});+ justify-content: space-between;+ margin: 8px auto;}#title div {@@ -78,15 +79,17 @@ export class PageGateway extends Page<AppStateKeyed> {}#title > div > or-icon {+ --or-icon-width: 20px;+ --or-icon-height: 20px;margin-right: 10px;margin-left: 14px;}or-panel {position: relative;+ width: calc(100% - 40px);max-width: 1360px;- width: 100%;- margin: 20px auto;+ margin: 0 auto 16px;}.gateway-status-header {diff --git a/ui/app/manager/src/pages/page-users.ts b/ui/app/manager/src/pages/page-users.tsindex 7c6729929..ed6f46f92 100644--- a/ui/app/manager/src/pages/page-users.ts+++ b/ui/app/manager/src/pages/page-users.ts@@ -87,7 +87,7 @@ export class PageUsers extends Page<AppStateKeyed> {border: 1px solid #e5e5e5;border-radius: 5px;position: relative;- margin: 0 auto 10px;+ margin: 0 auto 16px;padding: 12px 24px 24px;display: flex;flex-direction: column;diff --git a/ui/component/or-rules/src/json-viewer/modals/or-rule-alarm-modal.ts b/ui/component/or-rules/src/json-viewer/modals/or-rule-alarm-modal.tsindex a41a8ceb4..35425b479 100644--- a/ui/component/or-rules/src/json-viewer/modals/or-rule-alarm-modal.ts+++ b/ui/component/or-rules/src/json-viewer/modals/or-rule-alarm-modal.ts@@ -17,7 +17,7 @@* 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 {html, LitElement, PropertyValues} from "lit";+import {css, html, LitElement, PropertyValues} from "lit";import {customElement, property} from "lit/decorators.js";import {RuleActionAlarm,@@ -62,9 +62,28 @@ const checkValidity = (form:HTMLElement | null, dialog:OrMwcDialog) => {}}}++// language=CSS+const style = css`+ :host {+ display: flex;+ align-items: center;+ }+ :host > * {+ margin: 0 3px 6px;+ }+ .min-width {+ min-width: 200px;+ }+`;+@customElement("or-rule-alarm-modal")export class OrRuleAlarmModal extends translate(i18next)(LitElement) {+ static get styles() {+ return style;+ }+@property({type: Object, attribute: false})public action!: RuleActionAlarm;@@ -147,7 +166,7 @@ export class OrRuleAlarmModal extends translate(i18next)(LitElement) {};return html`- <or-mwc-input style="width: 200px" .type="${InputType.SELECT}" .value="${this.action.alarm?.severity}" .label="${i18next.t("alarm.severity")}" .options="${[AlarmSeverity.LOW, AlarmSeverity.MEDIUM, AlarmSeverity.HIGH]}" @or-mwc-input-changed="${(e: OrInputChangedEvent) => this.setActionAlarmSeverity(e.detail.value)}"></or-mwc-input>+ <or-mwc-input style="width: 200px" .type="${InputType.SELECT}" .value="${this.action.alarm?.severity}" .label="${i18next.t("alarm.severity")}" .options="${[[AlarmSeverity.LOW, i18next.t("alarm.severity_LOW")], [AlarmSeverity.MEDIUM, i18next.t("alarm.severity_MEDIUM")], [AlarmSeverity.HIGH, i18next.t("alarm.severity_HIGH")]]}" @or-mwc-input-changed="${(e: OrInputChangedEvent) => this.setActionAlarmSeverity(e.detail.value)}"></or-mwc-input><or-mwc-input .type="${InputType.BUTTON}" .label="${i18next.t("settings")}" @or-mwc-input-changed="${alarmPickerModalOpen}"></or-mwc-input><or-mwc-dialog id="alarm-modal" heading="${this.title}" .actions="${alarmPickerModalActions}"></or-mwc-dialog><slot class="alarm-form-slot"></slot>diff --git a/ui/component/or-rules/src/json-viewer/or-rule-action-alarm.ts b/ui/component/or-rules/src/json-viewer/or-rule-action-alarm.tsindex ff9c87921..5264f705d 100644--- a/ui/component/or-rules/src/json-viewer/or-rule-action-alarm.ts+++ b/ui/component/or-rules/src/json-viewer/or-rule-action-alarm.ts@@ -17,7 +17,7 @@* 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 { css, html, LitElement, TemplateResult } from "lit";+import { html, LitElement, TemplateResult } from "lit";import { customElement, property } from "lit/decorators.js";import { ActionType, RulesConfig } from "../index";import {@@ -30,28 +30,9 @@ import "./modals/or-rule-alarm-modal";import "./forms/or-rule-form-alarm";import manager from "@openremote/core";--// language=CSS-const style = css`- :host {- display: flex;- align-items: center;- }- :host > * {- margin: 0 3px 6px;- }- .min-width {- min-width: 200px;- }-`;-@customElement("or-rule-action-alarm")export class OrRuleActionAlarm extends LitElement {- static get styles() {- return style;- }-@property({ type: Object, attribute: false })public rule!: JsonRule;@@ -97,11 +78,9 @@ export class OrRuleActionAlarm extends LitElement {if (alarm) {modalTemplate = html`- <div style="display: flex;">- <or-rule-alarm-modal title="alarm." .action="${this.action}">- <or-rule-form-alarm .users="${this._loadedUsers}" .action="${this.action}"></or-rule-form-alarm>- </or-rule-alarm-modal>- </div>+ <or-rule-alarm-modal title="alarm." .action="${this.action}">+ <or-rule-form-alarm .users="${this._loadedUsers}" .action="${this.action}"></or-rule-form-alarm>+ </or-rule-alarm-modal>`;}