summaryrefslogtreecommitdiff
path: root/views/controls/editor/media-editor.ejs
diff options
context:
space:
mode:
authorJules Laplace <jules@okfoc.us>2014-09-30 18:43:03 -0400
committerJules Laplace <jules@okfoc.us>2014-09-30 18:43:03 -0400
commit397738f8ce460fd76c10e5a5e832720804016964 (patch)
treeea92f99c878bd016214f00d2662c8202d55639e5 /views/controls/editor/media-editor.ejs
parenta4eb980bcb2cce616abfb6300e1b80d8323899e4 (diff)
parentdf2956a33736e1c6cd982e04bca204ab5f7d09bf (diff)
Merge branch 'master' of github.com:okfocus/vvalls
Diffstat (limited to 'views/controls/editor/media-editor.ejs')
-rw-r--r--views/controls/editor/media-editor.ejs3
1 files changed, 2 insertions, 1 deletions
diff --git a/views/controls/editor/media-editor.ejs b/views/controls/editor/media-editor.ejs
index ef46e6f..305a602 100644
--- a/views/controls/editor/media-editor.ejs
+++ b/views/controls/editor/media-editor.ejs
@@ -43,6 +43,7 @@
<label for="scenery-height">height</label>
<input type="text" class="units" name="height" id="scenery-height">
</div>
+ <!--
<div class="setting number">
<select id="builder-units" name="units">
<option value="px">pixels</option>
@@ -50,7 +51,7 @@
<option value="m">meter</option>
</select>
</div>
-
+ -->
<div class="setting">
<a href="#" class="warn btn" data-role="destroy-media">remove from wall</a>
</div>