aboutsummaryrefslogtreecommitdiff
path: root/js
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
parentaaa917e53253b595c59e6e9549fcb95a402af364 (diff)
downloadninja-e04903ed2d2e6754119550cb071e03878bb1b14b.tar.gz
Objects Tray - Move back to binding view
Diffstat (limited to 'js')
-rwxr-xr-xjs/stage/binding-view.reel/binding-view.css11
-rwxr-xr-xjs/stage/binding-view.reel/binding-view.html10
-rwxr-xr-xjs/stage/stage.reel/stage.css18
-rwxr-xr-xjs/stage/stage.reel/stage.html12
4 files changed, 21 insertions, 30 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>
diff --git a/js/stage/stage.reel/stage.css b/js/stage/stage.reel/stage.css
index bc20c4f3..2271cd8a 100755
--- a/js/stage/stage.reel/stage.css
+++ b/js/stage/stage.reel/stage.css
@@ -48,24 +48,6 @@
48 width:2500px;/*to prevent scrolling of editor container in the middle of the page for short files*/ 48 width:2500px;/*to prevent scrolling of editor container in the middle of the page for short files*/
49} 49}
50 50
51.stage-tray-container {
52 height: 100%;
53 position: absolute;
54 width: 100%;
55}
56
57.objects-tray-container {
58 bottom: 10px;
59 position: absolute;
60 width: 100%;
61 display: -webkit-box;
62 -webkit-box-orient: horizontal;
63 -webkit-box-pack: center;
64 -webkit-box-align: center;
65 z-index: 2;
66}
67
68
69span.CodeMirror-matchhighlight { background: #e9e9e9 } 51span.CodeMirror-matchhighlight { background: #e9e9e9 }
70.CodeMirror-focused span.CodeMirror-matchhighlight { background: #e7e4ff; !important } 52.CodeMirror-focused span.CodeMirror-matchhighlight { background: #e7e4ff; !important }
71div.CodeMirror span.CodeMirror-matchingbracket {color: #000 !important;background-color: #ffd500;} 53div.CodeMirror span.CodeMirror-matchingbracket {color: #000 !important;background-color: #ffd500;}
diff --git a/js/stage/stage.reel/stage.html b/js/stage/stage.reel/stage.html
index acab4b1b..397af0b6 100755
--- a/js/stage/stage.reel/stage.html
+++ b/js/stage/stage.reel/stage.html
@@ -47,12 +47,6 @@
47 "element": {"#": "bindingView" } 47 "element": {"#": "bindingView" }
48 } 48 }
49 }, 49 },
50 "objectsTray" : {
51 "prototype": "js/stage/objects-tray.reel",
52 "properties": {
53 "element": {"#": "objects-tray" }
54 }
55 },
56 "owner": { 50 "owner": {
57 "prototype": "js/stage/stage.reel", 51 "prototype": "js/stage/stage.reel",
58 "properties": { 52 "properties": {
@@ -89,12 +83,6 @@
89 <canvas data-montage-id="gridCanvas" class="gridCanvas"></canvas> 83 <canvas data-montage-id="gridCanvas" class="gridCanvas"></canvas>
90 <canvas data-montage-id="layoutCanvas" class="layoutCanvas"></canvas> 84 <canvas data-montage-id="layoutCanvas" class="layoutCanvas"></canvas>
91 <canvas data-montage-id="stageCanvas" class="stageCanvas"></canvas> 85 <canvas data-montage-id="stageCanvas" class="stageCanvas"></canvas>
92 <div class="stage-tray-container">
93 <div class="objects-tray-container">
94 <div data-montage-id="objects-tray" ></div>
95 </div>
96 </div>
97
98 <canvas data-montage-id="drawingCanvas" class="drawingCanvas"></canvas> 86 <canvas data-montage-id="drawingCanvas" class="drawingCanvas"></canvas>
99 <section data-montage-id="bindingView" class="bindingView"></section> 87 <section data-montage-id="bindingView" class="bindingView"></section>
100 </section> 88 </section>