diff options
| author | Jules Laplace <jules@okfoc.us> | 2014-09-29 18:21:24 -0400 |
|---|---|---|
| committer | Jules Laplace <jules@okfoc.us> | 2014-09-29 18:21:24 -0400 |
| commit | 387d3c55fe5342f4154a25b0622e1d24a7815cff (patch) | |
| tree | 4a3ea8042a5bdf4e4aa004ff4feb76fddf79822a /views/controls | |
| parent | 70e95dd95bccad8a62a2b26322836f4da4c34270 (diff) | |
| parent | b9a926a99b3f655ce2e0022335bc2bffb559f5f7 (diff) | |
Merge branch 'master' of github.com:okfocus/vvalls
Diffstat (limited to 'views/controls')
| -rw-r--r-- | views/controls/editor/light-control.ejs | 10 | ||||
| -rw-r--r-- | views/controls/reader/about-room.ejs | 2 |
2 files changed, 10 insertions, 2 deletions
diff --git a/views/controls/editor/light-control.ejs b/views/controls/editor/light-control.ejs index 1ed6ef6..65a602f 100644 --- a/views/controls/editor/light-control.ejs +++ b/views/controls/editor/light-control.ejs @@ -5,11 +5,19 @@ </div> <div class="color-swatches"> + <span> <div class="swatch" id="wall-color" data-mode="wall"></div><label>wall</label> + </span> + <span class="active"> <div class="swatch" id="floor-color" data-mode="floor"></div><label>floor</label> + </span> + <span> <div class="swatch" id="ceiling-color" data-mode="ceiling"></div><label>ceiling</label> - <br> + </span> + <span> <div class="swatch" id="outline-color" data-mode="outline"></div><label>outlines</label> + </span> + <span> </div> <!-- diff --git a/views/controls/reader/about-room.ejs b/views/controls/reader/about-room.ejs index 7338f48..e13f363 100644 --- a/views/controls/reader/about-room.ejs +++ b/views/controls/reader/about-room.ejs @@ -9,7 +9,7 @@ <h2> Last modified [[- date ]] [[ if (canEdit) { ]] - <br> <a href="[[- editlink ]]" class="editlink">Edit Room</a> + <a href="[[- editlink ]]" class="btn warn marg">Edit Room</a> [[ } ]] </h2> </div> |