Skip to content

armgit / core

Public Imported from GitHub
0

100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps

UI updates: Minor styling updates

Rich Turnerf2ddaa3aa79b
diff --git a/ui/component/or-attribute-input/src/index.ts b/ui/component/or-attribute-input/src/index.ts
index d42364b80..ad2073634 100644
--- a/ui/component/or-attribute-input/src/index.ts
+++ b/ui/component/or-attribute-input/src/index.ts
@@ -59,7 +59,7 @@ export function getAttributeInputWrapper(content: TemplateResult, value: any, lo
if (helperText) {
content = html`
<div id="wrapper-helper">
- ${label ? html`<div style="margin-left: 16px">${label}</div>` : ``}
+ ${label ? html`<div id="wrapper-label">${label}</div>` : ``}
<div id="wrapper-input">${content}</div>
<div id="helper-text">${helperText}</div>
</div>
@@ -143,13 +143,12 @@ export class OrAttributeInput extends subscribe(manager)(translate(i18next)(LitE
display: flex;
}
- #wrapper-input > or-input {
+ #wrapper-label, #helper-text {
margin-left: 16px;
}
/* Copy of mdc text field helper text styles */
- #helper-text {
- margin-left: 16px;
+ #helper-text {
min-width: 255px;
color: rgba(0, 0, 0, 0.6);
font-family: Roboto, sans-serif;
diff --git a/ui/component/or-input/src/index.ts b/ui/component/or-input/src/index.ts
index cb12f3227..a185b7bbd 100644
--- a/ui/component/or-input/src/index.ts
+++ b/ui/component/or-input/src/index.ts
@@ -135,7 +135,7 @@ function inputTypeSupportsHelperText(inputType: InputType) {
}
function inputTypeSupportsLabel(inputType: InputType) {
- return inputTypeSupportsHelperText(inputType) || inputType === InputType.CHECKBOX || inputType === InputType.SWITCH;
+ return inputTypeSupportsHelperText(inputType) || inputType === InputType.CHECKBOX;
}
export const getValueHolderInputTemplateProvider: ValueInputProviderGenerator = (assetDescriptor: AssetDescriptor | string, valueHolder: NameValueHolder<any> | undefined, valueHolderDescriptor: ValueDescriptorHolder | undefined, valueDescriptor: ValueDescriptor, valueChangeNotifier: (value: any | undefined) => void, options: ValueInputProviderOptions) => {
@@ -468,11 +468,7 @@ const style = css`
.mdc-text-field--focused .mdc-text-field__input:required ~ .mdc-notched-outline .mdc-floating-label::after {
color: var(--mdc-theme-primary);
}
-
- .mdc-text-field__input[type="color" i] {
- width: unset;
- }
-
+
.mdc-text-field, .mdc-text-field-helper-line {
width: 100%;
}
@@ -511,6 +507,10 @@ const style = css`
flex: 1;
}
+ .mdc-switch {
+ margin: 0 24px;
+ }
+
#field {
height: 100%;
}