diff options
Diffstat (limited to 'views/controls')
| -rw-r--r-- | views/controls/editor/light-control.ejs | 16 | ||||
| -rw-r--r-- | views/controls/editor/media-drawer.ejs | 4 | ||||
| -rw-r--r-- | views/controls/editor/media-editor.ejs | 4 | ||||
| -rw-r--r-- | views/controls/editor/settings.ejs | 10 | ||||
| -rw-r--r-- | views/controls/editor/toolbar.ejs | 2 | ||||
| -rw-r--r-- | views/controls/editor/wallpaper.ejs | 5 | ||||
| -rw-r--r-- | views/controls/reader/about-room.ejs | 8 |
7 files changed, 33 insertions, 16 deletions
diff --git a/views/controls/editor/light-control.ejs b/views/controls/editor/light-control.ejs index a67df34..8b133a5 100644 --- a/views/controls/editor/light-control.ejs +++ b/views/controls/editor/light-control.ejs @@ -1,16 +1,26 @@ <div class="vvbox lightcontrol"> - + <div id="color-picker"> + </div> + <div class="slider"> + <h4>Brightness Control</h4> <input type="range" min="0" max="110" value="0" id="brightness-control" /> - <h4>Brightness</h4> </div> <div class="color-swatches"> + <span> <div class="swatch" id="wall-color" data-mode="wall"></div><label>wall</label> + </span> + <span class="active"> <div class="swatch" id="floor-color" data-mode="floor"></div><label>floor</label> + </span> + <span> <div class="swatch" id="ceiling-color" data-mode="ceiling"></div><label>ceiling</label> - <br> + </span> + <span> <div class="swatch" id="outline-color" data-mode="outline"></div><label>outlines</label> + </span> + <span> </div> <!-- diff --git a/views/controls/editor/media-drawer.ejs b/views/controls/editor/media-drawer.ejs index 456699c..d73a3ef 100644 --- a/views/controls/editor/media-drawer.ejs +++ b/views/controls/editor/media-drawer.ejs @@ -16,8 +16,8 @@ <div class="mediaDrawer fixed animate mediaViewer"> <span class="close">X</span> - <h2><a href="#" class="yourMedia active">Your Media</a> – <a href="#" class="foundToggle">Found Media</a></h2><br> - <h3 class="editBtn" id="deleteMedia">delete media</h3> + <h2><a href="#" class="userToggle active">Your Media</a> – <a href="#" class="foundToggle">Found Media</a></h2><br> + <h3 class="editBtn warn" id="deleteMedia">delete media?</h3> <div class="myMedia"> </div> diff --git a/views/controls/editor/media-editor.ejs b/views/controls/editor/media-editor.ejs index 7f8f299..000e8db 100644 --- a/views/controls/editor/media-editor.ejs +++ b/views/controls/editor/media-editor.ejs @@ -50,7 +50,7 @@ </select> </div> - <div class="setting subButtons"> - <a href="#" data-role="destroy-media">Delete</a> + <div class="setting"> + <a href="#" class="warn btn" data-role="destroy-media">delete this media</a> </div> </div> diff --git a/views/controls/editor/settings.ejs b/views/controls/editor/settings.ejs index e4ec7ee..ed587fa 100644 --- a/views/controls/editor/settings.ejs +++ b/views/controls/editor/settings.ejs @@ -27,11 +27,11 @@ <div class="radio-group"> <input id="privacy_private" class="radio-group__option" type="radio" name="privacy" value="public" checked> <label class="radio-group__label" for="privacy_private"> - Everyone + Public </label> <input id="privacy_public" class="radio-group__option" type="radio" name="privacy" value="private"> <label class="radio-group__label" for="privacy_public"> - Just for me + Private </label> </div> </div> @@ -39,8 +39,8 @@ <button data-role="save-project">Save</button> </div> <div class="setting subButtons"> - <a href="#" data-role="clear-project">Clear</a> - <a href="#" data-role="clone-project">Clone</a> - <a href="#" data-role="destroy-project">Delete</a> + <a href="#" data-role="clear-project" class="btn">Clear</a> + <a href="#" data-role="clone-project" class="btn">Clone</a> + <a href="#" data-role="destroy-project" class="btn warn">Delete Room</a> </div> </div> diff --git a/views/controls/editor/toolbar.ejs b/views/controls/editor/toolbar.ejs index e073df4..4abf780 100644 --- a/views/controls/editor/toolbar.ejs +++ b/views/controls/editor/toolbar.ejs @@ -17,7 +17,7 @@ class="icon-ios7-keypad-outline"></span> <span data-role='toggle-light-control' - data-info="light control" + data-info="edit room colors" class="icon-ios7-sunny-outline"></span> <span data-role='edit-wall-text' diff --git a/views/controls/editor/wallpaper.ejs b/views/controls/editor/wallpaper.ejs index 02ab16d..208dfff 100644 --- a/views/controls/editor/wallpaper.ejs +++ b/views/controls/editor/wallpaper.ejs @@ -1,8 +1,13 @@ <div class="vvbox wallpaper"> + + <!-- IF NO WALL PAPER --> + <span class="txt">Add custom wallpaper to walls. Begin by uploading a pattern. Or try this one -> </span> + <div class="swatches"></div> <div class="wallpaperUpload"> <form> + <span class="icon-ios7-upload-outline upload-icon"></span> <label>Upload wallpaper</label> <input type="file" accept="image/*" class="file" multiple> diff --git a/views/controls/reader/about-room.ejs b/views/controls/reader/about-room.ejs index 2aa244b..e13f363 100644 --- a/views/controls/reader/about-room.ejs +++ b/views/controls/reader/about-room.ejs @@ -1,15 +1,17 @@ <div class="aboutRoom vvbox"> <h1> - [[- name ]],<br> + [[- name ]], <a href="[[- authorlink ]]">[[- author ]]</a> </h1> + [[ if (description) { ]] + <span class="txt">[[- description ]]</span> + [[ } ]] <h2> Last modified [[- date ]] [[ if (canEdit) { ]] - · <a href="[[- editlink ]]" class="editlink">Edit</a> + <a href="[[- editlink ]]" class="btn warn marg">Edit Room</a> [[ } ]] </h2> - <span>[[- description ]]</span> </div> <div class="share"> |