diff options
| author | Julie Lala <jules@okfoc.us> | 2014-08-28 20:43:48 -0400 |
|---|---|---|
| committer | Julie Lala <jules@okfoc.us> | 2014-08-28 20:43:48 -0400 |
| commit | 7998129546e67c0ffcbf63d5132de6333a44b912 (patch) | |
| tree | b1da33d0925cb24b0c3e250cc6326b2e939be6c7 /views/controls | |
| parent | a3d40aa3718fce0754d7f78b19de9a00cac15395 (diff) | |
| parent | e35e2f338ee7b14d8396485e58cb5593060add8e (diff) | |
merge
Diffstat (limited to 'views/controls')
| -rw-r--r-- | views/controls/editor/light-control.ejs | 7 | ||||
| -rw-r--r-- | views/controls/editor/wallpaper.ejs | 12 |
2 files changed, 17 insertions, 2 deletions
diff --git a/views/controls/editor/light-control.ejs b/views/controls/editor/light-control.ejs index 4324087..8536b74 100644 --- a/views/controls/editor/light-control.ejs +++ b/views/controls/editor/light-control.ejs @@ -6,8 +6,11 @@ </div> <div class="color-swatches"> - <div class="swatch" id="wall-color"></div> <label>wall color</label> - <div class="swatch" id="outline-color"></div> <label>outline color</label> + <div class="swatch" id="wall-color"></div><label>wall</label> + <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..55ecf85 100644 --- a/views/controls/editor/wallpaper.ejs +++ b/views/controls/editor/wallpaper.ejs @@ -1,4 +1,16 @@ <div class="vvbox wallpaper"> + <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> |