diff options
Diffstat (limited to 'views')
| -rw-r--r-- | views/controls/editor/light-control.ejs | 4 | ||||
| -rw-r--r-- | views/controls/editor/wallpaper.ejs | 14 | ||||
| -rw-r--r-- | views/partials/scripts.ejs | 1 |
3 files changed, 16 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> diff --git a/views/partials/scripts.ejs b/views/partials/scripts.ejs index ae5b31f..544c37e 100644 --- a/views/partials/scripts.ejs +++ b/views/partials/scripts.ejs @@ -63,6 +63,7 @@ <script type="text/javascript" src="/assets/javascripts/ui/lib/Router.js"></script> <script type="text/javascript" src="/assets/javascripts/ui/lib/ModalView.js"></script> <script type="text/javascript" src="/assets/javascripts/ui/lib/FormView.js"></script> +<script type="text/javascript" src="/assets/javascripts/ui/lib/UploadView.js"></script> <script type="text/javascript" src="/assets/javascripts/ui/lib/AlertModal.js"></script> <script type="text/javascript" src="/assets/javascripts/ui/lib/ConfirmModal.js"></script> <script type="text/javascript" src="/assets/javascripts/ui/lib/ErrorModal.js"></script> |