Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Ben Hardill
2013-10-01 12:45:12 +01:00
7 changed files with 318 additions and 38 deletions

View File

@@ -20,7 +20,7 @@
<input type="text" id="node-input-name" placeholder="Comment">
</div>
<div class="form-row">
<label for="node-input-info"><i class="icon-file"></i> More</label>
<label for="node-input-info" style="width: 100% !important;"><i class="icon-file"></i> More</label>
<input type="hidden" id="node-input-info">
<div style="height: 250px;" class="node-text-editor" id="node-input-info-editor" ></div>
</div>