summaryrefslogtreecommitdiff
path: root/views
diff options
context:
space:
mode:
authorryderr <r@okfoc.us>2014-10-17 13:00:36 -0400
committerryderr <r@okfoc.us>2014-10-17 13:00:36 -0400
commitc99a5651e30838db43ee6f1b24a9fdc71d7affff (patch)
treeac470f7ba26b315d8186e09e90e2311a0a9dc4e7 /views
parent631da6497b18393daf302e01842a3c0c90b346e3 (diff)
parent38a948be224d704589fa203520f224615a81c7d9 (diff)
Merge branch 'master' of github.com:okfocus/vvalls
Diffstat (limited to 'views')
-rw-r--r--views/controls/editor/presets.ejs1
-rw-r--r--views/controls/editor/wallpaper.ejs1
2 files changed, 1 insertions, 1 deletions
diff --git a/views/controls/editor/presets.ejs b/views/controls/editor/presets.ejs
index 02e9d42..04b1cf1 100644
--- a/views/controls/editor/presets.ejs
+++ b/views/controls/editor/presets.ejs
@@ -2,5 +2,4 @@
<h4>Preset Styles</h4>
<div class="presets">
</div>
- <input type="text" class="url" placeholder="enter a url">
</div>
diff --git a/views/controls/editor/wallpaper.ejs b/views/controls/editor/wallpaper.ejs
index 39a109b..ed175ae 100644
--- a/views/controls/editor/wallpaper.ejs
+++ b/views/controls/editor/wallpaper.ejs
@@ -32,6 +32,7 @@
<label>Resize Wallpaper</label>
</div>
-->
+ <input type="text" class="url" placeholder="enter a url">
<div class="wallpaperResizeControls">
<span data-role="wallpaper-position" class="ion-arrow-expand"></span>