diff options
| author | Jules Laplace <jules@okfoc.us> | 2014-11-13 13:35:09 -0500 |
|---|---|---|
| committer | Jules Laplace <jules@okfoc.us> | 2014-11-13 13:35:09 -0500 |
| commit | 26012de0cd12fe717e19c951505f9263e047580f (patch) | |
| tree | 0b2c8fa2762c2f4bfe4aca600906a4626fdee4e3 /views/controls | |
| parent | 4e9ae814bafe7bb358326821da7432f685495804 (diff) | |
| parent | bb6d520f07ca5aa481cb80558dd9078f600a1d64 (diff) | |
merge
Diffstat (limited to 'views/controls')
| -rw-r--r-- | views/controls/editor/color-control.ejs | 2 | ||||
| -rw-r--r-- | views/controls/editor/text-editor.ejs | 23 | ||||
| -rw-r--r-- | views/controls/editor/toolbar.ejs | 2 |
3 files changed, 20 insertions, 7 deletions
diff --git a/views/controls/editor/color-control.ejs b/views/controls/editor/color-control.ejs index 1fa1688..c035e24 100644 --- a/views/controls/editor/color-control.ejs +++ b/views/controls/editor/color-control.ejs @@ -4,7 +4,7 @@ <div class="colors"> </div> - <div id="color-picker"> + <div class="color-picker"> </div> <div class="slider"> 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> diff --git a/views/controls/editor/toolbar.ejs b/views/controls/editor/toolbar.ejs index 23d5eb4..6960cbc 100644 --- a/views/controls/editor/toolbar.ejs +++ b/views/controls/editor/toolbar.ejs @@ -32,12 +32,10 @@ data-role='toggle-color-control' data-info="edit room colors" class="ion-ios7-sunny-outline"></span> -[[ if (user.username == "asdf") { ]] <span data-role='toggle-text-editor' data-info="add text to wall" class="ion-ios7-compose-outline"></span> -[[ } ]] <!-- <span data-role='toggle-map-view' |