Merge branch 'domoticz' into dev

This commit is contained in:
Xose Pérez
2016-12-31 05:11:39 +01:00
2 changed files with 7 additions and 2 deletions

View File

@@ -64,3 +64,7 @@ div.hint {
.template {
display: none;
}
.pure-form .center {
margin: .5em 0 .2em;
}

View File

@@ -145,7 +145,7 @@
<div id="relayTemplate" class="template">
<div class="pure-g">
<div class="pure-u-1 pure-u-sm-1-4"><label >Relay<span class="relay_id"></span> Status</label></div>
<label class="pure-u-1 pure-u-sm-1-4">Relay<span class="relay_id"></span> Status</label>
<div class="pure-u-1 pure-u-sm-1-4"><input type="checkbox" class="relayStatus" data="0" /></div>
</div>
</div>
@@ -383,7 +383,8 @@
<div id="idxTemplate" class="template">
<div class="pure-g">
<label class="pure-u-1 pure-u-sm-1-4">Relay<span class="id"></span> IDX</label>
<input class="pure-u-1 pure-u-sm-1-4 dczIdx" name="dczIdx" type="number" tabindex="0" data="0" /></div>
<div class="pure-u-1 pure-u-sm-1-8"><input class="pure-u-sm-23-24 dczIdx" name="dczIdx" type="number" min="0" tabindex="0" data="0" /></div>
<div class="pure-u-1 pure-u-sm-5-8 hint center">Set to 0 to disable notifications.</div>
</div>
</div>