aboutsummaryrefslogtreecommitdiff
path: root/js/stage/binding-view.reel
diff options
context:
space:
mode:
authorEric Guzman2012-06-18 19:08:05 -0700
committerEric Guzman2012-06-18 19:08:05 -0700
commite04903ed2d2e6754119550cb071e03878bb1b14b (patch)
treef38534a7d8a3dc75909419a4bd823db73f771435 /js/stage/binding-view.reel
parentaaa917e53253b595c59e6e9549fcb95a402af364 (diff)
downloadninja-e04903ed2d2e6754119550cb071e03878bb1b14b.tar.gz
Objects Tray - Move back to binding view
Diffstat (limited to 'js/stage/binding-view.reel')
-rwxr-xr-xjs/stage/binding-view.reel/binding-view.css11
-rwxr-xr-xjs/stage/binding-view.reel/binding-view.html10
2 files changed, 21 insertions, 0 deletions
diff --git a/js/stage/binding-view.reel/binding-view.css b/js/stage/binding-view.reel/binding-view.css
index 37bc8318..543577d1 100755
--- a/js/stage/binding-view.reel/binding-view.css
+++ b/js/stage/binding-view.reel/binding-view.css
@@ -5,6 +5,7 @@
5 </copyright> */ 5 </copyright> */
6 6
7.bindingView { 7.bindingView {
8 height: 100%;
8 position: absolute; 9 position: absolute;
9 width:100%; 10 width:100%;
10 z-index: 12; 11 z-index: 12;
@@ -23,3 +24,13 @@
23 z-index: 1; 24 z-index: 1;
24} 25}
25 26
27.objects-tray-container {
28 bottom: 10px;
29 position: absolute;
30 width: 100%;
31 display: -webkit-box;
32 -webkit-box-orient: horizontal;
33 -webkit-box-pack: center;
34 -webkit-box-align: center;
35 z-index: 2;
36} \ No newline at end of file
diff --git a/js/stage/binding-view.reel/binding-view.html b/js/stage/binding-view.reel/binding-view.html
index e0c42194..91c9e397 100755
--- a/js/stage/binding-view.reel/binding-view.html
+++ b/js/stage/binding-view.reel/binding-view.html
@@ -27,6 +27,12 @@
27 "objects": {"<-": "@owner.bindables"} 27 "objects": {"<-": "@owner.bindables"}
28 } 28 }
29 }, 29 },
30 "objectsTray" : {
31 "prototype": "js/stage/objects-tray.reel",
32 "properties": {
33 "element": {"#": "objects-tray" }
34 }
35 },
30 "hud": { 36 "hud": {
31 "prototype": "js/stage/binding-view.reel/binding-hud.reel", 37 "prototype": "js/stage/binding-view.reel/binding-hud.reel",
32 "properties": { 38 "properties": {
@@ -57,6 +63,10 @@
57 </div> 63 </div>
58 </div> 64 </div>
59 65
66 <div class="objects-tray-container">
67 <div data-montage-id="objects-tray" ></div>
68 </div>
69
60 </section> 70 </section>
61 71
62</body> 72</body>