diff options
| author | ryderr <r@okfoc.us> | 2014-10-16 10:43:17 -0400 |
|---|---|---|
| committer | ryderr <r@okfoc.us> | 2014-10-16 10:43:17 -0400 |
| commit | 5f91a568db7f69489851c373e54cf911d29e3054 (patch) | |
| tree | 3b92d3a0782353fefa8967c78762d324913df730 /views/controls/editor/toolbar.ejs | |
| parent | 20f37d08394df097db45e0092e4420f31b5be161 (diff) | |
| parent | 1a15b32d8cc8fcf27861f94151ca63eb6d8736c2 (diff) | |
merge
Diffstat (limited to 'views/controls/editor/toolbar.ejs')
| -rw-r--r-- | views/controls/editor/toolbar.ejs | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/views/controls/editor/toolbar.ejs b/views/controls/editor/toolbar.ejs index 8ea21d5..7b08db6 100644 --- a/views/controls/editor/toolbar.ejs +++ b/views/controls/editor/toolbar.ejs @@ -1,6 +1,11 @@ <div class="edit menu vvbox" id="editorToolbar" data-intro="This is the main toolbar. Add and select media, Apply wallpaper, change room name etc." data-position="left"> - +<!-- + <span + data-role='undo' + data-info="undo" + class="ion-reply"></span> + --> <span data-role='open-media-viewer' data-info="add media" @@ -11,10 +16,6 @@ class="ion-ios7-briefcase-outline"></span> <!-- <span - data-role='undo' - data-info="undo" - class="ion-reply"></span> - <span data-role='resize-media' data-info="resize media" class="ion-arrow-resize"></span> @@ -28,9 +29,10 @@ data-info="add wallpaper" class="ion-ios7-keypad-outline"></span> <span - data-role='toggle-light-control' + data-role='toggle-color-control' data-info="edit room colors" class="ion-ios7-sunny-outline"></span> +<!-- <span data-role='toggle-text-editor' data-info="add text to wall" @@ -39,6 +41,7 @@ data-role='toggle-map-view' data-info="toggle map view" class="ion-ios7-world-outline"></span> + --> <span data-role='toggle-project-settings' data-info="room settings" |