diff options
| author | Jules Laplace <jules@okfoc.us> | 2014-10-02 14:32:05 -0400 |
|---|---|---|
| committer | Jules Laplace <jules@okfoc.us> | 2014-10-02 14:32:05 -0400 |
| commit | 04fab20e51e5dbc30a8c3e440fcfb16730c424ab (patch) | |
| tree | 0506fa7b48106a462e708fc44669eaa8cdbbadf6 /views | |
| parent | fa81420e382366ffd0d2262f1af6143399f7a91d (diff) | |
| parent | 110097063ab30187a6fd6536111312b021c3e653 (diff) | |
Merge branch 'master' of github.com:okfocus/vvalls
Diffstat (limited to 'views')
| -rw-r--r-- | views/controls/editor/collaborators.ejs | 10 | ||||
| -rw-r--r-- | views/controls/editor/toolbar.ejs | 3 | ||||
| -rwxr-xr-x | views/editor.ejs | 2 | ||||
| -rw-r--r-- | views/partials/meta.ejs | 1 | ||||
| -rw-r--r-- | views/partials/scripts.ejs | 1 |
5 files changed, 11 insertions, 6 deletions
diff --git a/views/controls/editor/collaborators.ejs b/views/controls/editor/collaborators.ejs index 69e5b64..b658bf6 100644 --- a/views/controls/editor/collaborators.ejs +++ b/views/controls/editor/collaborators.ejs @@ -1,7 +1,9 @@ <div class="collaborators fixed mediaDrawer animate"> <span class="close">X</span> - - <div> + + <div class="rap"> + <div class="holder"> + <div class="inner vvbox"> <h2>Collaborators</h2> <p> @@ -21,9 +23,9 @@ <ul id="collaborator-list"> </ul> - </div> - + </div> +</div> </div> <script type="text/html" id="collaborator-template"> diff --git a/views/controls/editor/toolbar.ejs b/views/controls/editor/toolbar.ejs index 92807e1..586194b 100644 --- a/views/controls/editor/toolbar.ejs +++ b/views/controls/editor/toolbar.ejs @@ -1,4 +1,5 @@ -<div class="edit menu vvbox" id="editorToolbar"> + +<div class="edit menu vvbox" id="editorToolbar" data-intro="This is the main toolbar. Add and select media, Apply wallpaper, change room name etc." data-position="left"> <span data-role='open-media-viewer' data-info="add media" diff --git a/views/editor.ejs b/views/editor.ejs index e029225..3c4caf1 100755 --- a/views/editor.ejs +++ b/views/editor.ejs @@ -22,7 +22,7 @@ [[ include controls/editor/settings ]] </div> - <div id="minimap" class="vvbox"> + <div id="minimap" class="vvbox" data-intro="Mini-map shows your position and orientation in a room. Navigate with WASD keys or drag here." data-position="top"> <span class="el"></span> </div> diff --git a/views/partials/meta.ejs b/views/partials/meta.ejs index 4e94a5e..6ff45cb 100644 --- a/views/partials/meta.ejs +++ b/views/partials/meta.ejs @@ -33,6 +33,7 @@ <link href='/assets/stylesheets/ionicons.css' rel='stylesheet' type='text/css'> <link href='/assets/stylesheets/app.css' rel='stylesheet' type='text/css'> <link href='/assets/stylesheets/animate.css' rel='stylesheet' type='text/css'> + <link href='/assets/stylesheets/chardinjs.css' rel='stylesheet' type='text/css'> <!--[if lt IE 9]> <style> diff --git a/views/partials/scripts.ejs b/views/partials/scripts.ejs index 5ddab2a..4af9938 100644 --- a/views/partials/scripts.ejs +++ b/views/partials/scripts.ejs @@ -7,6 +7,7 @@ <script type="text/javascript" src="/assets/javascripts/vendor/loader.js"></script> <script type="text/javascript" src="/assets/javascripts/vendor/polyfill.js"></script> <script type="text/javascript" src="/assets/javascripts/vendor/wow.js"></script> +<script type="text/javascript" src="/assets/javascripts/vendor/chardinjs.min.js"></script> <script type="text/javascript" src="/assets/javascripts/vendor/sha1.js"></script> <script type="text/javascript" src="/assets/javascripts/vendor/dataUriToBlob.js"></script> <script type="text/javascript" src="/assets/javascripts/util.js"></script> |