Fix zero margin not applied in oh-grid-layout (#973)
Make slider label help more descriptive Fix load issue in item-list-vlist Signed-off-by: Hubert Nusser <hubsif@gmx.de>pull/975/head
parent
e542c9bd17
commit
b7bec07f66
|
@ -51,7 +51,7 @@ A regular or expandable cell
|
|||
</PropBlock>
|
||||
<PropBlock type="TEXT" name="icon" label="Icon">
|
||||
<PropDescription>
|
||||
Use <code>oh:iconName</code> (<a class="external text-color-blue" target="_blank" href="https://www.openhab.org/link/icons">openHAB icon</a>) or <code>f7:iconName</code> (<a class="external text-color-blue" target="_blank" href="https://framework7.io/icons/">Framework7 icon</a>)
|
||||
Use <code>oh:iconName</code> (<a class="external text-color-blue" target="_blank" href="https://www.openhab.org/link/icons">openHAB icon</a>), <code>f7:iconName</code> (<a class="external text-color-blue" target="_blank" href="https://framework7.io/icons/">Framework7 icon</a>) or <code>material:iconName</code> (<a class="external text-color-blue" target="_blank" href="https://jossef.github.io/material-design-icons-iconfont/">Material icon</a>)
|
||||
</PropDescription>
|
||||
</PropBlock>
|
||||
<PropBlock type="TEXT" name="color" label="Highlight Color">
|
||||
|
|
|
@ -51,7 +51,7 @@ A cell expanding to a color picker
|
|||
</PropBlock>
|
||||
<PropBlock type="TEXT" name="icon" label="Icon">
|
||||
<PropDescription>
|
||||
Use <code>oh:iconName</code> (<a class="external text-color-blue" target="_blank" href="https://www.openhab.org/link/icons">openHAB icon</a>) or <code>f7:iconName</code> (<a class="external text-color-blue" target="_blank" href="https://framework7.io/icons/">Framework7 icon</a>)
|
||||
Use <code>oh:iconName</code> (<a class="external text-color-blue" target="_blank" href="https://www.openhab.org/link/icons">openHAB icon</a>), <code>f7:iconName</code> (<a class="external text-color-blue" target="_blank" href="https://framework7.io/icons/">Framework7 icon</a>) or <code>material:iconName</code> (<a class="external text-color-blue" target="_blank" href="https://jossef.github.io/material-design-icons-iconfont/">Material icon</a>)
|
||||
</PropDescription>
|
||||
</PropBlock>
|
||||
<PropBlock type="TEXT" name="color" label="Highlight Color">
|
||||
|
|
|
@ -46,7 +46,7 @@ Display a color picker in a list
|
|||
</PropBlock>
|
||||
<PropBlock type="TEXT" name="icon" label="Icon">
|
||||
<PropDescription>
|
||||
Use <code>oh:iconName</code> (<a class="external text-color-blue" target="_blank" href="https://www.openhab.org/link/icons">openHAB icon</a>) or <code>f7:iconName</code> (<a class="external text-color-blue" target="_blank" href="https://framework7.io/icons/">Framework7 icon</a>)
|
||||
Use <code>oh:iconName</code> (<a class="external text-color-blue" target="_blank" href="https://www.openhab.org/link/icons">openHAB icon</a>), <code>f7:iconName</code> (<a class="external text-color-blue" target="_blank" href="https://framework7.io/icons/">Framework7 icon</a>) or <code>material:iconName</code> (<a class="external text-color-blue" target="_blank" href="https://jossef.github.io/material-design-icons-iconfont/">Material icon</a>)
|
||||
</PropDescription>
|
||||
</PropBlock>
|
||||
<PropBlock type="TEXT" name="iconColor" label="Icon Color">
|
||||
|
|
|
@ -72,7 +72,7 @@ Display an input in a card
|
|||
</PropBlock>
|
||||
<PropBlock type="TEXT" name="inputmode" label="Input Mode">
|
||||
<PropDescription>
|
||||
Type of data that might be entered: see <a class="external text-color-blue" target="_blank" href="https://developer.mozilla.org/en-US/docs/Web/HTML/Global_attributes/inputmode">MDN docs</a>
|
||||
Type of data that might be entered (see <a class="external text-color-blue" target="_blank" href="https://developer.mozilla.org/en-US/docs/Web/HTML/Global_attributes/inputmode">MDN docs</a>)
|
||||
</PropDescription>
|
||||
</PropBlock>
|
||||
<PropBlock type="TEXT" name="placeholder" label="Placeholder">
|
||||
|
|
|
@ -46,7 +46,7 @@ Display an input field in a list
|
|||
</PropBlock>
|
||||
<PropBlock type="TEXT" name="icon" label="Icon">
|
||||
<PropDescription>
|
||||
Use <code>oh:iconName</code> (<a class="external text-color-blue" target="_blank" href="https://www.openhab.org/link/icons">openHAB icon</a>) or <code>f7:iconName</code> (<a class="external text-color-blue" target="_blank" href="https://framework7.io/icons/">Framework7 icon</a>)
|
||||
Use <code>oh:iconName</code> (<a class="external text-color-blue" target="_blank" href="https://www.openhab.org/link/icons">openHAB icon</a>), <code>f7:iconName</code> (<a class="external text-color-blue" target="_blank" href="https://framework7.io/icons/">Framework7 icon</a>) or <code>material:iconName</code> (<a class="external text-color-blue" target="_blank" href="https://jossef.github.io/material-design-icons-iconfont/">Material icon</a>)
|
||||
</PropDescription>
|
||||
</PropBlock>
|
||||
<PropBlock type="TEXT" name="iconColor" label="Icon Color">
|
||||
|
@ -77,7 +77,7 @@ Display an input field in a list
|
|||
</PropBlock>
|
||||
<PropBlock type="TEXT" name="inputmode" label="Input Mode">
|
||||
<PropDescription>
|
||||
Type of data that might be entered: see <a class="external text-color-blue" target="_blank" href="https://developer.mozilla.org/en-US/docs/Web/HTML/Global_attributes/inputmode">MDN docs</a>
|
||||
Type of data that might be entered (see <a class="external text-color-blue" target="_blank" href="https://developer.mozilla.org/en-US/docs/Web/HTML/Global_attributes/inputmode">MDN docs</a>)
|
||||
</PropDescription>
|
||||
</PropBlock>
|
||||
<PropBlock type="TEXT" name="placeholder" label="Placeholder">
|
||||
|
|
|
@ -40,7 +40,7 @@ Displays an input field, used to set a variable
|
|||
</PropBlock>
|
||||
<PropBlock type="TEXT" name="inputmode" label="Input Mode">
|
||||
<PropDescription>
|
||||
Type of data that might be entered: see <a class="external text-color-blue" target="_blank" href="https://developer.mozilla.org/en-US/docs/Web/HTML/Global_attributes/inputmode">MDN docs</a>
|
||||
Type of data that might be entered (see <a class="external text-color-blue" target="_blank" href="https://developer.mozilla.org/en-US/docs/Web/HTML/Global_attributes/inputmode">MDN docs</a>)
|
||||
</PropDescription>
|
||||
</PropBlock>
|
||||
<PropBlock type="TEXT" name="placeholder" label="Placeholder">
|
||||
|
|
|
@ -51,7 +51,7 @@ A cell expanding to a knob control
|
|||
</PropBlock>
|
||||
<PropBlock type="TEXT" name="icon" label="Icon">
|
||||
<PropDescription>
|
||||
Use <code>oh:iconName</code> (<a class="external text-color-blue" target="_blank" href="https://www.openhab.org/link/icons">openHAB icon</a>) or <code>f7:iconName</code> (<a class="external text-color-blue" target="_blank" href="https://framework7.io/icons/">Framework7 icon</a>)
|
||||
Use <code>oh:iconName</code> (<a class="external text-color-blue" target="_blank" href="https://www.openhab.org/link/icons">openHAB icon</a>), <code>f7:iconName</code> (<a class="external text-color-blue" target="_blank" href="https://framework7.io/icons/">Framework7 icon</a>) or <code>material:iconName</code> (<a class="external text-color-blue" target="_blank" href="https://jossef.github.io/material-design-icons-iconfont/">Material icon</a>)
|
||||
</PropDescription>
|
||||
</PropBlock>
|
||||
<PropBlock type="TEXT" name="color" label="Highlight Color">
|
||||
|
|
|
@ -237,7 +237,7 @@ Display the state of an item in a card
|
|||
</PropBlock>
|
||||
<PropBlock type="TEXT" name="icon" label="Icon">
|
||||
<PropDescription>
|
||||
Use <code>oh:iconName</code> (<a class="external text-color-blue" target="_blank" href="https://www.openhab.org/link/icons">openHAB icon</a>) or <code>f7:iconName</code> (<a class="external text-color-blue" target="_blank" href="https://framework7.io/icons/">Framework7 icon</a>)
|
||||
Use <code>oh:iconName</code> (<a class="external text-color-blue" target="_blank" href="https://www.openhab.org/link/icons">openHAB icon</a>), <code>f7:iconName</code> (<a class="external text-color-blue" target="_blank" href="https://framework7.io/icons/">Framework7 icon</a>) or <code>material:iconName</code> (<a class="external text-color-blue" target="_blank" href="https://jossef.github.io/material-design-icons-iconfont/">Material icon</a>)
|
||||
</PropDescription>
|
||||
</PropBlock>
|
||||
<PropBlock type="TEXT" name="iconColor" label="Icon Color">
|
||||
|
|
|
@ -51,7 +51,7 @@ A cell with a big label to show a short item state value
|
|||
</PropBlock>
|
||||
<PropBlock type="TEXT" name="icon" label="Icon">
|
||||
<PropDescription>
|
||||
Use <code>oh:iconName</code> (<a class="external text-color-blue" target="_blank" href="https://www.openhab.org/link/icons">openHAB icon</a>) or <code>f7:iconName</code> (<a class="external text-color-blue" target="_blank" href="https://framework7.io/icons/">Framework7 icon</a>)
|
||||
Use <code>oh:iconName</code> (<a class="external text-color-blue" target="_blank" href="https://www.openhab.org/link/icons">openHAB icon</a>), <code>f7:iconName</code> (<a class="external text-color-blue" target="_blank" href="https://framework7.io/icons/">Framework7 icon</a>) or <code>material:iconName</code> (<a class="external text-color-blue" target="_blank" href="https://jossef.github.io/material-design-icons-iconfont/">Material icon</a>)
|
||||
</PropDescription>
|
||||
</PropBlock>
|
||||
<PropBlock type="TEXT" name="color" label="Highlight Color">
|
||||
|
|
|
@ -57,7 +57,7 @@ Display the state of an item in a list
|
|||
</PropBlock>
|
||||
<PropBlock type="TEXT" name="icon" label="Icon">
|
||||
<PropDescription>
|
||||
Use <code>oh:iconName</code> (<a class="external text-color-blue" target="_blank" href="https://www.openhab.org/link/icons">openHAB icon</a>) or <code>f7:iconName</code> (<a class="external text-color-blue" target="_blank" href="https://framework7.io/icons/">Framework7 icon</a>)
|
||||
Use <code>oh:iconName</code> (<a class="external text-color-blue" target="_blank" href="https://www.openhab.org/link/icons">openHAB icon</a>), <code>f7:iconName</code> (<a class="external text-color-blue" target="_blank" href="https://framework7.io/icons/">Framework7 icon</a>) or <code>material:iconName</code> (<a class="external text-color-blue" target="_blank" href="https://jossef.github.io/material-design-icons-iconfont/">Material icon</a>)
|
||||
</PropDescription>
|
||||
</PropBlock>
|
||||
<PropBlock type="TEXT" name="iconColor" label="Icon Color">
|
||||
|
|
|
@ -46,7 +46,7 @@ A list item
|
|||
</PropBlock>
|
||||
<PropBlock type="TEXT" name="icon" label="Icon">
|
||||
<PropDescription>
|
||||
Use <code>oh:iconName</code> (<a class="external text-color-blue" target="_blank" href="https://www.openhab.org/link/icons">openHAB icon</a>) or <code>f7:iconName</code> (<a class="external text-color-blue" target="_blank" href="https://framework7.io/icons/">Framework7 icon</a>)
|
||||
Use <code>oh:iconName</code> (<a class="external text-color-blue" target="_blank" href="https://www.openhab.org/link/icons">openHAB icon</a>), <code>f7:iconName</code> (<a class="external text-color-blue" target="_blank" href="https://framework7.io/icons/">Framework7 icon</a>) or <code>material:iconName</code> (<a class="external text-color-blue" target="_blank" href="https://jossef.github.io/material-design-icons-iconfont/">Material icon</a>)
|
||||
</PropDescription>
|
||||
</PropBlock>
|
||||
<PropBlock type="TEXT" name="iconColor" label="Icon Color">
|
||||
|
|
|
@ -51,7 +51,7 @@ A marker on a floor plan
|
|||
<PropGroup name="icon" label="Icon">
|
||||
<PropBlock type="TEXT" name="icon" label="Icon">
|
||||
<PropDescription>
|
||||
Use <code>oh:iconName</code> (<a class="external text-color-blue" target="_blank" href="https://www.openhab.org/link/icons">openHAB icon</a>) or <code>f7:iconName</code> (<a class="external text-color-blue" target="_blank" href="https://framework7.io/icons/">Framework7 icon</a>)
|
||||
Use <code>oh:iconName</code> (<a class="external text-color-blue" target="_blank" href="https://www.openhab.org/link/icons">openHAB icon</a>), <code>f7:iconName</code> (<a class="external text-color-blue" target="_blank" href="https://framework7.io/icons/">Framework7 icon</a>) or <code>material:iconName</code> (<a class="external text-color-blue" target="_blank" href="https://jossef.github.io/material-design-icons-iconfont/">Material icon</a>)
|
||||
</PropDescription>
|
||||
</PropBlock>
|
||||
<PropBlock type="BOOLEAN" name="iconUseState" label="Icon depends on state">
|
||||
|
|
|
@ -46,7 +46,7 @@ Display player controls in a list
|
|||
</PropBlock>
|
||||
<PropBlock type="TEXT" name="icon" label="Icon">
|
||||
<PropDescription>
|
||||
Use <code>oh:iconName</code> (<a class="external text-color-blue" target="_blank" href="https://www.openhab.org/link/icons">openHAB icon</a>) or <code>f7:iconName</code> (<a class="external text-color-blue" target="_blank" href="https://framework7.io/icons/">Framework7 icon</a>)
|
||||
Use <code>oh:iconName</code> (<a class="external text-color-blue" target="_blank" href="https://www.openhab.org/link/icons">openHAB icon</a>), <code>f7:iconName</code> (<a class="external text-color-blue" target="_blank" href="https://framework7.io/icons/">Framework7 icon</a>) or <code>material:iconName</code> (<a class="external text-color-blue" target="_blank" href="https://jossef.github.io/material-design-icons-iconfont/">Material icon</a>)
|
||||
</PropDescription>
|
||||
</PropBlock>
|
||||
<PropBlock type="TEXT" name="iconColor" label="Icon Color">
|
||||
|
|
|
@ -51,7 +51,7 @@ A cell expanding to rollershutter controls
|
|||
</PropBlock>
|
||||
<PropBlock type="TEXT" name="icon" label="Icon">
|
||||
<PropDescription>
|
||||
Use <code>oh:iconName</code> (<a class="external text-color-blue" target="_blank" href="https://www.openhab.org/link/icons">openHAB icon</a>) or <code>f7:iconName</code> (<a class="external text-color-blue" target="_blank" href="https://framework7.io/icons/">Framework7 icon</a>)
|
||||
Use <code>oh:iconName</code> (<a class="external text-color-blue" target="_blank" href="https://www.openhab.org/link/icons">openHAB icon</a>), <code>f7:iconName</code> (<a class="external text-color-blue" target="_blank" href="https://framework7.io/icons/">Framework7 icon</a>) or <code>material:iconName</code> (<a class="external text-color-blue" target="_blank" href="https://jossef.github.io/material-design-icons-iconfont/">Material icon</a>)
|
||||
</PropDescription>
|
||||
</PropBlock>
|
||||
<PropBlock type="TEXT" name="color" label="Highlight Color">
|
||||
|
|
|
@ -46,7 +46,7 @@ Display rollershutter controls in a list
|
|||
</PropBlock>
|
||||
<PropBlock type="TEXT" name="icon" label="Icon">
|
||||
<PropDescription>
|
||||
Use <code>oh:iconName</code> (<a class="external text-color-blue" target="_blank" href="https://www.openhab.org/link/icons">openHAB icon</a>) or <code>f7:iconName</code> (<a class="external text-color-blue" target="_blank" href="https://framework7.io/icons/">Framework7 icon</a>)
|
||||
Use <code>oh:iconName</code> (<a class="external text-color-blue" target="_blank" href="https://www.openhab.org/link/icons">openHAB icon</a>), <code>f7:iconName</code> (<a class="external text-color-blue" target="_blank" href="https://framework7.io/icons/">Framework7 icon</a>) or <code>material:iconName</code> (<a class="external text-color-blue" target="_blank" href="https://jossef.github.io/material-design-icons-iconfont/">Material icon</a>)
|
||||
</PropDescription>
|
||||
</PropBlock>
|
||||
<PropBlock type="TEXT" name="iconColor" label="Icon Color">
|
||||
|
|
|
@ -87,7 +87,7 @@ Display a slider in a card to control an item
|
|||
</PropBlock>
|
||||
<PropBlock type="BOOLEAN" name="label" label="Display Label">
|
||||
<PropDescription>
|
||||
Display a label above the slider knob
|
||||
Display a label above the slider knob while sliding
|
||||
</PropDescription>
|
||||
</PropBlock>
|
||||
<PropBlock type="BOOLEAN" name="scale" label="Display Scale">
|
||||
|
|
|
@ -51,7 +51,7 @@ A cell expanding to a big vertical slider
|
|||
</PropBlock>
|
||||
<PropBlock type="TEXT" name="icon" label="Icon">
|
||||
<PropDescription>
|
||||
Use <code>oh:iconName</code> (<a class="external text-color-blue" target="_blank" href="https://www.openhab.org/link/icons">openHAB icon</a>) or <code>f7:iconName</code> (<a class="external text-color-blue" target="_blank" href="https://framework7.io/icons/">Framework7 icon</a>)
|
||||
Use <code>oh:iconName</code> (<a class="external text-color-blue" target="_blank" href="https://www.openhab.org/link/icons">openHAB icon</a>), <code>f7:iconName</code> (<a class="external text-color-blue" target="_blank" href="https://framework7.io/icons/">Framework7 icon</a>) or <code>material:iconName</code> (<a class="external text-color-blue" target="_blank" href="https://jossef.github.io/material-design-icons-iconfont/">Material icon</a>)
|
||||
</PropDescription>
|
||||
</PropBlock>
|
||||
<PropBlock type="TEXT" name="color" label="Highlight Color">
|
||||
|
@ -97,7 +97,7 @@ A cell expanding to a big vertical slider
|
|||
</PropBlock>
|
||||
<PropBlock type="BOOLEAN" name="label" label="Display Label">
|
||||
<PropDescription>
|
||||
Display a label above the slider knob
|
||||
Display a label above the slider knob while sliding
|
||||
</PropDescription>
|
||||
</PropBlock>
|
||||
<PropBlock type="BOOLEAN" name="scale" label="Display Scale">
|
||||
|
|
|
@ -46,7 +46,7 @@ Display a slider control in a list
|
|||
</PropBlock>
|
||||
<PropBlock type="TEXT" name="icon" label="Icon">
|
||||
<PropDescription>
|
||||
Use <code>oh:iconName</code> (<a class="external text-color-blue" target="_blank" href="https://www.openhab.org/link/icons">openHAB icon</a>) or <code>f7:iconName</code> (<a class="external text-color-blue" target="_blank" href="https://framework7.io/icons/">Framework7 icon</a>)
|
||||
Use <code>oh:iconName</code> (<a class="external text-color-blue" target="_blank" href="https://www.openhab.org/link/icons">openHAB icon</a>), <code>f7:iconName</code> (<a class="external text-color-blue" target="_blank" href="https://framework7.io/icons/">Framework7 icon</a>) or <code>material:iconName</code> (<a class="external text-color-blue" target="_blank" href="https://jossef.github.io/material-design-icons-iconfont/">Material icon</a>)
|
||||
</PropDescription>
|
||||
</PropBlock>
|
||||
<PropBlock type="TEXT" name="iconColor" label="Icon Color">
|
||||
|
@ -92,7 +92,7 @@ Display a slider control in a list
|
|||
</PropBlock>
|
||||
<PropBlock type="BOOLEAN" name="label" label="Display Label">
|
||||
<PropDescription>
|
||||
Display a label above the slider knob
|
||||
Display a label above the slider knob while sliding
|
||||
</PropDescription>
|
||||
</PropBlock>
|
||||
<PropBlock type="BOOLEAN" name="scale" label="Display Scale">
|
||||
|
|
|
@ -55,7 +55,7 @@ Slider control, allows to pick a number value on a scale
|
|||
</PropBlock>
|
||||
<PropBlock type="BOOLEAN" name="label" label="Display Label">
|
||||
<PropDescription>
|
||||
Display a label above the slider knob
|
||||
Display a label above the slider knob while sliding
|
||||
</PropDescription>
|
||||
</PropBlock>
|
||||
<PropBlock type="BOOLEAN" name="scale" label="Display Scale">
|
||||
|
|
|
@ -46,7 +46,7 @@ Display a stepper control in a list
|
|||
</PropBlock>
|
||||
<PropBlock type="TEXT" name="icon" label="Icon">
|
||||
<PropDescription>
|
||||
Use <code>oh:iconName</code> (<a class="external text-color-blue" target="_blank" href="https://www.openhab.org/link/icons">openHAB icon</a>) or <code>f7:iconName</code> (<a class="external text-color-blue" target="_blank" href="https://framework7.io/icons/">Framework7 icon</a>)
|
||||
Use <code>oh:iconName</code> (<a class="external text-color-blue" target="_blank" href="https://www.openhab.org/link/icons">openHAB icon</a>), <code>f7:iconName</code> (<a class="external text-color-blue" target="_blank" href="https://framework7.io/icons/">Framework7 icon</a>) or <code>material:iconName</code> (<a class="external text-color-blue" target="_blank" href="https://jossef.github.io/material-design-icons-iconfont/">Material icon</a>)
|
||||
</PropDescription>
|
||||
</PropBlock>
|
||||
<PropBlock type="TEXT" name="iconColor" label="Icon Color">
|
||||
|
|
|
@ -18,7 +18,7 @@ prev: /docs/ui/components/
|
|||
<!-- Note: you can overwrite the definition-provided description and add your own intro/additional sections instead -->
|
||||
<!-- DO NOT REMOVE the following comments if you intend to keep the definition-provided description -->
|
||||
<!-- GENERATED componentDescription -->
|
||||
Display a toggle switch in a card to send ON/OFF commands
|
||||
Display a toggle swtich in a card to send ON/OFF commands
|
||||
<!-- GENERATED /componentDescription -->
|
||||
|
||||
## Configuration
|
||||
|
|
|
@ -46,7 +46,7 @@ Display a toggle switch in a list
|
|||
</PropBlock>
|
||||
<PropBlock type="TEXT" name="icon" label="Icon">
|
||||
<PropDescription>
|
||||
Use <code>oh:iconName</code> (<a class="external text-color-blue" target="_blank" href="https://www.openhab.org/link/icons">openHAB icon</a>) or <code>f7:iconName</code> (<a class="external text-color-blue" target="_blank" href="https://framework7.io/icons/">Framework7 icon</a>)
|
||||
Use <code>oh:iconName</code> (<a class="external text-color-blue" target="_blank" href="https://www.openhab.org/link/icons">openHAB icon</a>), <code>f7:iconName</code> (<a class="external text-color-blue" target="_blank" href="https://framework7.io/icons/">Framework7 icon</a>) or <code>material:iconName</code> (<a class="external text-color-blue" target="_blank" href="https://jossef.github.io/material-design-icons-iconfont/">Material icon</a>)
|
||||
</PropDescription>
|
||||
</PropBlock>
|
||||
<PropBlock type="TEXT" name="iconColor" label="Icon Color">
|
||||
|
|
|
@ -6,7 +6,7 @@ export default () => [
|
|||
pd('max', 'Max', 'Maximum value'),
|
||||
pd('step', 'Step', 'Minimum interval between values'),
|
||||
pd('vertical', 'Vertical', 'Display the slider vertically'),
|
||||
pb('label', 'Display Label', 'Display a label above the slider knob'),
|
||||
pb('label', 'Display Label', 'Display a label above the slider knob while sliding'),
|
||||
pb('scale', 'Display Scale', 'Display a scale on the slider'),
|
||||
pn('scaleSteps', 'Scale steps', 'Number of (major) scale markers'),
|
||||
pn('scaleSubSteps', 'Scale sub-steps', 'Number of scale minor markers between each major marker'),
|
||||
|
|
|
@ -117,7 +117,7 @@ export default {
|
|||
},
|
||||
created () {
|
||||
this.colNum = this.config.colNum || 16
|
||||
this.margin = this.config.margin || 10
|
||||
this.margin = this.config.margin >= 0 ? this.config.margin : 10
|
||||
|
||||
if (this.config.layoutType === 'fixed') {
|
||||
this.style.width = this.screenWidth = this.config.screenWidth || 1280
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
<template>
|
||||
<f7-page @page:init="load" @page:reinit="load" @page:afterout="stopEventSource">
|
||||
<f7-page @page:beforein="load" @page:afterout="stopEventSource">
|
||||
<f7-navbar title="Items" back-link="Settings" back-link-url="/settings/" back-link-force>
|
||||
<f7-nav-right>
|
||||
<f7-link icon-md="material:done_all" @click="toggleCheck()"
|
||||
|
|
Loading…
Reference in New Issue