diff options
| author | ryderr <r@okfoc.us> | 2014-11-13 13:35:57 -0500 |
|---|---|---|
| committer | ryderr <r@okfoc.us> | 2014-11-13 13:35:57 -0500 |
| commit | ab94732c54ed62e27cf63f1d2b292b7494432366 (patch) | |
| tree | c865a2b8797d52575df2f38f9c4a85428fe0a375 /views/controls/editor/text-editor.ejs | |
| parent | 61eebaa5c3ef0d839c00c4d512b402ba71f97454 (diff) | |
| parent | bb6d520f07ca5aa481cb80558dd9078f600a1d64 (diff) | |
Merge branch 'master' of github.com:okfocus/vvalls
Diffstat (limited to 'views/controls/editor/text-editor.ejs')
| -rw-r--r-- | views/controls/editor/text-editor.ejs | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/views/controls/editor/text-editor.ejs b/views/controls/editor/text-editor.ejs index c30cb67..baf9239 100644 --- a/views/controls/editor/text-editor.ejs +++ b/views/controls/editor/text-editor.ejs @@ -5,7 +5,7 @@ Click a wall to add text. </div> - <div class="setting"> + <div class="setting text-setting"> <select name="font-family"> <option>Baskerville</option> <option>Brush Script</option> @@ -46,14 +46,29 @@ <option value="right">Right</option> <option value="justify">Justify</option> </select> + <div class="swatch"></div> </div> - <div class="setting"> + <div class="setting text-setting"> <textarea name="text-body"></textarea> </div> - <div class="setting"> - <a href="#" class="warn btn" data-role="destroy-text">remove from wall</a> + <div class="setting text-setting"> + <a href="#" class="btn left" data-role="hide-text-editor">done</a> + <a href="#" class="warn btn right" data-role="destroy-text">remove from wall</a> + </div> + + <div class="setting color-setting"> + <a href="#" class="btn" data-role="hide-color-picker">done</a><br><br> + + <div class="colors"> + </div> + + <div class="color-picker"> + </div> + + <div class="slider"> + </div> </div> </div> |