aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArmen Kesablyan2012-06-15 16:07:20 -0700
committerArmen Kesablyan2012-06-15 16:07:20 -0700
commitd7456b5d8f5231b7cb6df31081474cfcd5900a84 (patch)
tree99aa737a2d7e6e012c6c1ea457236b3a289dff7c
parent593cad77591344a7f5667a01c252c82c5bb12ba3 (diff)
downloadninja-d7456b5d8f5231b7cb6df31081474cfcd5900a84.tar.gz
Put Objects in front of Huds
Signed-off-by: Armen Kesablyan <armen@motorola.com>
-rwxr-xr-xjs/stage/binding-view.reel/binding-hud.reel/binding-hud.css8
-rwxr-xr-xjs/stage/binding-view.reel/binding-view.css4
-rwxr-xr-xjs/stage/binding-view.reel/binding-view.html5
3 files changed, 9 insertions, 8 deletions
diff --git a/js/stage/binding-view.reel/binding-hud.reel/binding-hud.css b/js/stage/binding-view.reel/binding-hud.reel/binding-hud.css
index f7e926cb..c53c82e2 100755
--- a/js/stage/binding-view.reel/binding-hud.reel/binding-hud.css
+++ b/js/stage/binding-view.reel/binding-hud.reel/binding-hud.css
@@ -40,11 +40,15 @@
40 line-height:16px; 40 line-height:16px;
41 padding:1px 9px 1px 15px; 41 padding:1px 9px 1px 15px;
42} 42}
43.hudOption.bound, .bindingHud .hudOption.bound .connectorBubble, .bindingHud .hudOption:hover, .bindingHud .hudOption .connectorBubble { 43.connectorBubble, .bindingHud .hudOption:hover, .bindingHud .hudOption .connectorBubble:hover {
44 background: #5e9eff; 44 box-shadow: inset 0px 0px 6px #5e9eff;
45 display:block; 45 display:block;
46} 46}
47 47
48.hudOption.bound, .bindingHud .hudOption.bound {
49 background: #5e9eff;
50}
51
48.bindingHud .hudOption:last-child { 52.bindingHud .hudOption:last-child {
49 border-bottom: 0px; 53 border-bottom: 0px;
50} 54}
diff --git a/js/stage/binding-view.reel/binding-view.css b/js/stage/binding-view.reel/binding-view.css
index 7ec31edf..a08def8a 100755
--- a/js/stage/binding-view.reel/binding-view.css
+++ b/js/stage/binding-view.reel/binding-view.css
@@ -14,8 +14,7 @@
14.hudRepeater { 14.hudRepeater {
15 position: absolute; 15 position: absolute;
16 width:100%; 16 width:100%;
17 height:100%; 17 z-index: 3;
18 z-index: 2;
19} 18}
20 19
21.bindingViewCanvas { 20.bindingViewCanvas {
@@ -33,4 +32,5 @@
33 -webkit-box-orient: horizontal; 32 -webkit-box-orient: horizontal;
34 -webkit-box-pack: center; 33 -webkit-box-pack: center;
35 -webkit-box-align: center; 34 -webkit-box-align: center;
35 z-index: 2;
36} \ No newline at end of file 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 5fb7affd..9a127618 100755
--- a/js/stage/binding-view.reel/binding-view.html
+++ b/js/stage/binding-view.reel/binding-view.html
@@ -15,8 +15,7 @@
15 "prototype": "js/stage/binding-view.reel", 15 "prototype": "js/stage/binding-view.reel",
16 "properties": { 16 "properties": {
17 "element": {"#": "bindingView"}, 17 "element": {"#": "bindingView"},
18 "hudRepeater": {"@": "hudRepeater"}, 18 "hudRepeater": {"@": "hudRepeater"}
19 "canvas": {"#": "bindingViewCanvas"}
20 } 19 }
21 }, 20 },
22 "hudRepeater": { 21 "hudRepeater": {
@@ -66,8 +65,6 @@
66 <div class="objects-tray-container"> 65 <div class="objects-tray-container">
67 <div data-montage-id="objects-tray" ></div> 66 <div data-montage-id="objects-tray" ></div>
68 </div> 67 </div>
69
70 <canvas data-montage-id="bindingViewCanvas" class="bindingViewCanvas"></canvas>
71 </section> 68 </section>
72 69
73</body> 70</body>