diff options
Diffstat (limited to 'js/stage/stage.reel')
-rwxr-xr-x | js/stage/stage.reel/stage.css | 18 | ||||
-rwxr-xr-x | js/stage/stage.reel/stage.html | 12 |
2 files changed, 30 insertions, 0 deletions
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> |