Merge branch 'migrate-to-fa-icons' of https://github.com/hindessm/node-red-nodes into hindessm-migrate-to-fa-icons

Conflicts:
	io/ping/88-ping.html
	io/wol/39-wol.html
	social/nma/57-nma.html
	social/prowl/57-prowl.html
	social/pushover/57-pushover.html
	social/twilio/56-twilio.html
	storage/sqlite/sqlite.html
This commit is contained in:
Dave C-J
2014-09-03 22:16:02 +01:00
33 changed files with 155 additions and 127 deletions

View File

@@ -16,12 +16,12 @@
<script type="text/x-red" data-template-name="dweetio out">
<div class="form-row">
<label for="node-input-thing"><i class="icon-flag"></i> Thing</label>
<label for="node-input-thing"><i class="fa fa-flag"></i> Thing</label>
<input type="text" id="node-input-thing" placeholder="my-globally-unique-device-id">
</div>
<br/>
<div class="form-row">
<label for="node-input-name"><i class="icon-tag"></i> Name</label>
<label for="node-input-name"><i class="fa fa-tag"></i> Name</label>
<input type="text" id="node-input-name" placeholder="Name">
</div>
</script>
@@ -57,12 +57,12 @@
<script type="text/x-red" data-template-name="dweetio in">
<div class="form-row">
<label for="node-input-thing"><i class="icon-flag"></i> Thing</label>
<label for="node-input-thing"><i class="fa fa-flag"></i> Thing</label>
<input type="text" id="node-input-thing" placeholder="my-globally-unique-device-id">
</div>
<br/>
<div class="form-row">
<label for="node-input-name"><i class="icon-tag"></i> Name</label>
<label for="node-input-name"><i class="fa fa-tag"></i> Name</label>
<input type="text" id="node-input-name" placeholder="Name">
</div>
</script>