diff options
Diffstat (limited to 'js/stage')
-rwxr-xr-x | js/stage/binding-view.reel/binding-view.css | 11 | ||||
-rwxr-xr-x | js/stage/binding-view.reel/binding-view.html | 10 | ||||
-rwxr-xr-x | js/stage/stage.reel/stage.css | 18 | ||||
-rwxr-xr-x | js/stage/stage.reel/stage.html | 12 |
4 files changed, 31 insertions, 20 deletions
diff --git a/js/stage/binding-view.reel/binding-view.css b/js/stage/binding-view.reel/binding-view.css index a08def8a..37bc8318 100755 --- a/js/stage/binding-view.reel/binding-view.css +++ b/js/stage/binding-view.reel/binding-view.css | |||
@@ -5,7 +5,6 @@ | |||
5 | </copyright> */ | 5 | </copyright> */ |
6 | 6 | ||
7 | .bindingView { | 7 | .bindingView { |
8 | height: 100%; | ||
9 | position: absolute; | 8 | position: absolute; |
10 | width:100%; | 9 | width:100%; |
11 | z-index: 12; | 10 | z-index: 12; |
@@ -24,13 +23,3 @@ | |||
24 | z-index: 1; | 23 | z-index: 1; |
25 | } | 24 | } |
26 | 25 | ||
27 | .objects-tray-container { | ||
28 | bottom: 11px; | ||
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 9a127618..e0c42194 100755 --- a/js/stage/binding-view.reel/binding-view.html +++ b/js/stage/binding-view.reel/binding-view.html | |||
@@ -41,12 +41,6 @@ | |||
41 | "listener": {"@": "owner"} | 41 | "listener": {"@": "owner"} |
42 | } | 42 | } |
43 | ] | 43 | ] |
44 | }, | ||
45 | "objectsTray" : { | ||
46 | "prototype": "js/stage/objects-tray.reel", | ||
47 | "properties": { | ||
48 | "element": {"#": "objects-tray" } | ||
49 | } | ||
50 | } | 44 | } |
51 | } | 45 | } |
52 | </script> | 46 | </script> |
@@ -56,15 +50,13 @@ | |||
56 | 50 | ||
57 | 51 | ||
58 | <section data-montage-id="bindingView" class="bindingView"> | 52 | <section data-montage-id="bindingView" class="bindingView"> |
53 | |||
59 | <div data-montage-id="hudRepeater" class="hudRepeater"> | 54 | <div data-montage-id="hudRepeater" class="hudRepeater"> |
60 | <div data-montage-id="hud"> | 55 | <div data-montage-id="hud"> |
61 | 56 | ||
62 | </div> | 57 | </div> |
63 | </div> | 58 | </div> |
64 | 59 | ||
65 | <div class="objects-tray-container"> | ||
66 | <div data-montage-id="objects-tray" ></div> | ||
67 | </div> | ||
68 | </section> | 60 | </section> |
69 | 61 | ||
70 | </body> | 62 | </body> |
diff --git a/js/stage/stage.reel/stage.css b/js/stage/stage.reel/stage.css index 2271cd8a..bc20c4f3 100755 --- a/js/stage/stage.reel/stage.css +++ b/js/stage/stage.reel/stage.css | |||
@@ -48,6 +48,24 @@ | |||
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 | |||
51 | span.CodeMirror-matchhighlight { background: #e9e9e9 } | 69 | span.CodeMirror-matchhighlight { background: #e9e9e9 } |
52 | .CodeMirror-focused span.CodeMirror-matchhighlight { background: #e7e4ff; !important } | 70 | .CodeMirror-focused span.CodeMirror-matchhighlight { background: #e7e4ff; !important } |
53 | div.CodeMirror span.CodeMirror-matchingbracket {color: #000 !important;background-color: #ffd500;} | 71 | div.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 397af0b6..acab4b1b 100755 --- a/js/stage/stage.reel/stage.html +++ b/js/stage/stage.reel/stage.html | |||
@@ -47,6 +47,12 @@ | |||
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 | }, | ||
50 | "owner": { | 56 | "owner": { |
51 | "prototype": "js/stage/stage.reel", | 57 | "prototype": "js/stage/stage.reel", |
52 | "properties": { | 58 | "properties": { |
@@ -83,6 +89,12 @@ | |||
83 | <canvas data-montage-id="gridCanvas" class="gridCanvas"></canvas> | 89 | <canvas data-montage-id="gridCanvas" class="gridCanvas"></canvas> |
84 | <canvas data-montage-id="layoutCanvas" class="layoutCanvas"></canvas> | 90 | <canvas data-montage-id="layoutCanvas" class="layoutCanvas"></canvas> |
85 | <canvas data-montage-id="stageCanvas" class="stageCanvas"></canvas> | 91 | <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 | |||
86 | <canvas data-montage-id="drawingCanvas" class="drawingCanvas"></canvas> | 98 | <canvas data-montage-id="drawingCanvas" class="drawingCanvas"></canvas> |
87 | <section data-montage-id="bindingView" class="bindingView"></section> | 99 | <section data-montage-id="bindingView" class="bindingView"></section> |
88 | </section> | 100 | </section> |