diff options
| author | Jules Laplace <jules@okfoc.us> | 2014-08-27 17:28:52 -0400 |
|---|---|---|
| committer | Jules Laplace <jules@okfoc.us> | 2014-08-27 17:28:52 -0400 |
| commit | b6ce465de3e07cd88175078f7a1017b63a91646e (patch) | |
| tree | b573a887bab99549fe9204bb997d49e29cb6fb66 /views/controls | |
| parent | 63b0e94e3e36838240c2d86e780a641c2255ed89 (diff) | |
split out uploadview
Diffstat (limited to 'views/controls')
| -rw-r--r-- | views/controls/editor/light-control.ejs | 4 | ||||
| -rw-r--r-- | views/controls/editor/wallpaper.ejs | 14 |
2 files changed, 15 insertions, 3 deletions
diff --git a/views/controls/editor/light-control.ejs b/views/controls/editor/light-control.ejs index 02a78b6..8536b74 100644 --- a/views/controls/editor/light-control.ejs +++ b/views/controls/editor/light-control.ejs @@ -7,10 +7,10 @@ <div class="color-swatches"> <div class="swatch" id="wall-color"></div><label>wall</label> - <div class="swatch" id="outline-color"></div><label>outlines</label> - <br> <div class="swatch" id="floor-color"></div><label>floor</label> <div class="swatch" id="ceiling-color"></div><label>ceiling</label> + <br> + <div class="swatch" id="outline-color"></div><label>outlines</label> </div> <!-- diff --git a/views/controls/editor/wallpaper.ejs b/views/controls/editor/wallpaper.ejs index 144e419..ecb15ca 100644 --- a/views/controls/editor/wallpaper.ejs +++ b/views/controls/editor/wallpaper.ejs @@ -1,4 +1,16 @@ -<div class="vvbox wallpaper"> +<div class="vvbox wallpaper active"> + <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> + </form> +<!-- + <input type="text" placeholder="Enter Image URL" class="url"> + --> + </div> </div> <div class="floatingSwatch"></div> |