diff options
| author | Jules Laplace <jules@okfoc.us> | 2014-10-07 19:22:42 -0400 |
|---|---|---|
| committer | Jules Laplace <jules@okfoc.us> | 2014-10-07 19:22:42 -0400 |
| commit | d6d78ddf16e9cb6555e92089dfa77ba5648f686b (patch) | |
| tree | d9e62fa1bdf07cf60fdccfec4cf599e42be9a001 /views/controls/editor/wallpaper.ejs | |
| parent | 009205d55b7f04d2a08064a844e5e2b731fff7d8 (diff) | |
| parent | c2e2334328256fa0409341692284f25f3167ab30 (diff) | |
merge
Diffstat (limited to 'views/controls/editor/wallpaper.ejs')
| -rw-r--r-- | views/controls/editor/wallpaper.ejs | 28 |
1 files changed, 22 insertions, 6 deletions
diff --git a/views/controls/editor/wallpaper.ejs b/views/controls/editor/wallpaper.ejs index 95cf827..d54b9c1 100644 --- a/views/controls/editor/wallpaper.ejs +++ b/views/controls/editor/wallpaper.ejs @@ -1,14 +1,19 @@ <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"></span> + <span class="swatch"></span> + <span class="swatch"></span> + <span class="swatch"></span> + </span> - <div class="wallpaperUpload"> + <div class="wallpaperUpload toolButton"> <form> - <span class="icon-ios7-upload-outline upload-icon"></span> + <span class="ion-ios7-upload-outline upload-icon"></span> <label>Upload wallpaper</label> <input type="file" accept="image/*" class="file" multiple> </form> @@ -16,10 +21,21 @@ <input type="text" placeholder="Enter Image URL" class="url"> --> </div> - <div class="wallpaperRemove"> - <img src="/assets/img/scissors.png"> + <div class="wallpaperRemove toolButton"> + <span class="ion-scissors"></span> <label>Remove Wallpaper</label> </div> + + <div class="wallpaperResize toolButton"> + <span class="ion-arrow-resize"></span> + <label>Resize Wallpaper</label> + </div> + + <div class="wallpaperResizeControls"> + <span data-role="wallpaper-position" class="ion-arrow-expand"></span> + <input data-role="wallpaper-scale" type="range" min="0.01" max="8.0" step="0.1" value="1.0"> + </div> + </div> <div class="floatingSwatch"></div> |