Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into GridFixes

6 files changed, 149 insertions, 73 deletions

diff --git a/js/stage/binding-view.reel/binding-hud-option.reel/binding-hud-option.js b/js/stage/binding-view.reel/binding-hud-option.reel/binding-hud-option.js
index fb0fd57e..a7fbb297 100755
--- a/js/stage/binding-view.reel/binding-hud-option.reel/binding-hud-option.js
+++ b/js/stage/binding-view.reel/binding-hud-option.reel/binding-hud-option.js
@@ -26,8 +26,28 @@ exports.BindingHudOption = Montage.create(Component, {
         }
     },
 
-    bound: {
-        value: false
+    _promoted : { value: null },
+    promoted : {
+        get : function() { return this._promoted; },
+        set : function(value) {
+            if(value === this._promoted) { return; }
+
+            this._promoted = value;
+
+            this.needsDraw = true;
+        }
+    },
+
+    _bound : { value: null },
+    bound : {
+        get : function() { return this._bound; },
+        set : function(value) {
+            if(value === this._bound) { return; }
+
+            this._bound = value;
+
+            this.needsDraw = true;
+        }
     },
 
     prepareForDraw: {
@@ -47,6 +67,12 @@ exports.BindingHudOption = Montage.create(Component, {
             } else {
                 this.element.classList.remove("bound");
             }
+
+            if(this.promoted || this.bound) {
+                this.element.classList.add("promoted");
+            } else {
+                this.element.classList.remove("promoted");
+            }
 //            if(this.bindings.length > 0) {
 //                this.element.classList.add("bound");
 //            } else {
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 680f9183..1536c706 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
@@ -6,14 +6,12 @@
 
 .bindingHud {
     position: absolute;
-    background: rgba(0, 0, 0, 0.85);
-    /*padding: 0px;*/
+    background: rgba(24, 24, 24, 0.85);
     color: #C4C4C4;
     font-size: 11px;
-    box-shadow: inset 0px 0px 0px 0px #CCC;
+    box-shadow: 3px 3px 20px rgba(0, 0, 0, 0.61);
     border-radius: 6px;
-    padding: 3px 1px 1px;
-    border:1px solid #000;
+    padding: 3px;
     text-shadow: 1px 1px 0px #000;
 }
 
@@ -31,6 +29,8 @@
     /*background: rgba(0, 0, 0, 0.3);*/
     line-height:16px;
     /*box-shadow: inset 0px 0px 4px #333, 1px 1px 0px #3A3A3A;*/
+    padding-top: 4px;
+    margin: 0 5px;
     min-width: 80px;
 }
 
@@ -40,7 +40,10 @@
     line-height:16px;
     padding:1px 25px 1px 8px;
 }
-
+.bindingHud .hudOption.promoted {
+    color: #FFF;
+    font-weight: bold;
+}
 .bindingHud .hudOption .connectorBubble:hover {
     background-color: #1B52A7;
     box-shadow: inset 0px 2px 2px 1px rgba(15, 15, 15, 0.78), 0 1px #474747;
@@ -58,35 +61,35 @@
 
 .bindingHud .hudOption .connectorBubble {
     position: absolute;
-    right: 5px;
+    right: 2px;
     top: 3px;
     border-radius: 50%;
     width: 10px;
     height: 10px;
     border-left: 0px;
     display: block;
-    background-color: #313131;
-    box-shadow: inset 0px 2px 7px 1px #0F0F0F, 0 1px #424242;
+    background-color: #353535;
+    box-shadow: inset 0px 2px 3px 1px #222, 0 1px #666;
 
 }
 
 .splitter.scrollArea {
     background-color: transparent;
-    background-size: 12%;
+    background-size: 10%;
     background-position-y: 2px;
     display: none;
     height:11px;
     text-align: center;
 }
 .splitter.scrollAreaTop {
-    border-top: 1px solid #353535;
-    box-shadow: 0 -1px 0 0 #141414;
+    border-bottom: 1px solid #141414;
+    box-shadow: 0 1px 0 0 #525252;
 }
 .splitter.scrollAreaBottom {
     -webkit-transform: rotate(180deg);
     border-top-left-radius: 6px;
     border-top-right-radius: 6px;
-    border-bottom: 1px solid #353535;
+    border-bottom: 1px solid #525252;
     box-shadow: 0 1px 0 0 #141414;
     margin-top: 4px;
 }
@@ -95,9 +98,14 @@
     opacity: 0.5;
 }
 .splitter.scrollArea:hover:not(.disabled) {
-    background-color: #252525;
+    background-color: #303030;
+    border-bottom: 1px solid #252525;
+    box-shadow: 0 1px 0 0 #3F3F3F;
+}
+.splitter.scrollAreaBottom:hover:not(.disabled) {
+    border-bottom: 1px solid #3F3F3F;
+    box-shadow: 0 1px 0 0 #252525;
 }
-
 
 .hudRepetition {
     overflow: hidden;
diff --git a/js/stage/binding-view.reel/binding-hud.reel/binding-hud.html b/js/stage/binding-view.reel/binding-hud.reel/binding-hud.html
index 7bb888d5..f7e1a1d2 100755
--- a/js/stage/binding-view.reel/binding-hud.reel/binding-hud.html
+++ b/js/stage/binding-view.reel/binding-hud.reel/binding-hud.html
@@ -36,7 +36,8 @@
                     "element": {"#" : "hudOption"}
                 },
                 "bindings": {
-                    "title": {"<-": "@repeater.objectAtCurrentIteration"}
+                    "title": {"<-": "@repeater.objectAtCurrentIteration.property"},
+                    "promoted": {"<-": "@repeater.objectAtCurrentIteration.promoted"}
                 }
             },
             "resizer1": {
diff --git a/js/stage/binding-view.reel/binding-hud.reel/binding-hud.js b/js/stage/binding-view.reel/binding-hud.reel/binding-hud.js
index 9918b06d..1b0af09d 100755
--- a/js/stage/binding-view.reel/binding-hud.reel/binding-hud.js
+++ b/js/stage/binding-view.reel/binding-hud.reel/binding-hud.js
@@ -10,6 +10,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 */
 var Montage = require("montage/core/core").Montage,
     Component = require("montage/ui/component").Component;
+var ElementsMediator = require("js/mediators/element-mediator").ElementMediator;