summaryrefslogtreecommitdiff
path: root/views/controls/editor/wallpaper.ejs
diff options
context:
space:
mode:
authorJules Laplace <jules@okfoc.us>2016-10-28 18:06:46 -0400
committerJules Laplace <jules@okfoc.us>2016-10-28 18:06:46 -0400
commit9e7bacd46c1e5d0e1c24433690d421ab3f3a11f2 (patch)
tree4d0cefa2780dfa4382f1ed2ea481b6aafbdbb15e /views/controls/editor/wallpaper.ejs
parent50da9e3e677f121f15e501bf062da6c45db255ad (diff)
parentcce1dea756717f1308c6b72f762b5ea5f5b43958 (diff)
merge
Diffstat (limited to 'views/controls/editor/wallpaper.ejs')
-rw-r--r--views/controls/editor/wallpaper.ejs42
1 files changed, 28 insertions, 14 deletions
diff --git a/views/controls/editor/wallpaper.ejs b/views/controls/editor/wallpaper.ejs
index 208dfff..a53f462 100644
--- a/views/controls/editor/wallpaper.ejs
+++ b/views/controls/editor/wallpaper.ejs
@@ -1,25 +1,39 @@
<div class="vvbox wallpaper">
-
+ <h4>Add Wallpaper</h4>
<!-- IF NO WALL PAPER -->
- <span class="txt">Add custom wallpaper to walls. Begin by uploading a pattern. Or try this one -> </span>
+ <span class="txt" style="margin-bottom:7px">Add custom wallpaper to walls. Begin by uploading a pattern. Or try one of these -> </span>
- <div class="swatches"></div>
+ <span class="swatches">
+ <span class="swatch" style="background-image:url(/assets/img/offbeatrepeat.jpg)"></span>
+ <span class="swatch" style="background-image:url(/assets/img/plainpattern3.png)"></span>
+ <span class="swatch" style="background-image:url(/assets/img/plainpattern.png)"></span>
+ <span class="swatch" style="background-image:url(/assets/img/plainpattern2.png)"></span>
+ </span>
+
+ <input type="text" class="url" placeholder="Enter image URL">
- <div class="wallpaperUpload">
- <form>
+ <div class="wallpaperRemove toolButton">
+ <span class="ion-scissors"></span>
+ <label>Remove</label>
+ </div>
- <span class="icon-ios7-upload-outline upload-icon"></span>
- <label>Upload wallpaper</label>
- <input type="file" accept="image/*" class="file" multiple>
+ <div class="wallpaperUpload toolButton">
+ <form>
+ <span class="ion-ios-upload-outline upload-icon"></span>
+ <label>Upload</label>
+ <input type="file" accept="image/*" multiple>
</form>
-<!--
- <input type="text" placeholder="Enter Image URL" class="url">
- -->
</div>
- <div class="wallpaperRemove">
- <img src="/assets/img/scissors.png">
- <label>Remove Wallpaper</label>
+
+ <div class="wallpaperResizeControls">
+ <span data-role="wallpaper-position" class="ion-arrow-expand"></span>
+ <input data-role="wallpaper-scale" type="range" min="-4" max="4" step="0.01" value="0.0">
+ </div>
+
+ <div class="floodMessage">
+ Hit Enter to Flood the room!
</div>
+
</div>
<div class="floatingSwatch"></div>