summaryrefslogtreecommitdiff
path: root/views
diff options
context:
space:
mode:
Diffstat (limited to 'views')
-rw-r--r--views/controls/editor/media-editor.ejs3
-rw-r--r--views/controls/editor/toolbar.ejs10
2 files changed, 8 insertions, 5 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>
diff --git a/views/controls/editor/toolbar.ejs b/views/controls/editor/toolbar.ejs
index 1c4c26f..63df73c 100644
--- a/views/controls/editor/toolbar.ejs
+++ b/views/controls/editor/toolbar.ejs
@@ -12,6 +12,11 @@
data-role='destroy-media'
data-info="delete media"
class="icon-ios7-trash-outline"></span>
+
+ <span
+ data-role='edit-wall-text'
+ data-info="edit wall text"
+ class="icon-ios7-compose-outline"></span>
-->
<span
data-role='toggle-wallpaper-panel'
@@ -21,10 +26,7 @@
data-role='toggle-light-control'
data-info="edit room colors"
class="icon-ios7-sunny-outline"></span>
- <span
- data-role='edit-wall-text'
- data-info="edit wall text"
- class="icon-ios7-compose-outline"></span>
+
<span
data-role='toggle-project-settings'
data-info="room settings"