Squashed commit of the following:

merge master into timeline

Signed-off-by: Jonathan Duran <jduran@motorola.com>

42 files changed, 5 insertions, 5 deletions

diff --git a/js/panels/Color/colorchippopup.reel/.sass-cache/2fbca323ccf38cf180e7675ba0d8d3e07adeffea/ColorPanelPopup.scssc b/js/panels/Color/colorchippopup.reel/.sass-cache/2fbca323ccf38cf180e7675ba0d8d3e07adeffea/ColorPanelPopup.scssc
deleted file mode 100755
index aa8bf258..00000000
--- a/js/panels/Color/colorchippopup.reel/.sass-cache/2fbca323ccf38cf180e7675ba0d8d3e07adeffea/ColorPanelPopup.scssc
+++ /dev/null
diff --git a/js/panels/Color/colorchippopup.reel/.sass-cache/6f8390f69a31f1a976968b9c18d0824d78460db2/ColorPanelPopup.scssc b/js/panels/Color/colorchippopup.reel/.sass-cache/6f8390f69a31f1a976968b9c18d0824d78460db2/ColorPanelPopup.scssc
deleted file mode 100755
index fca60390..00000000
--- a/js/panels/Color/colorchippopup.reel/.sass-cache/6f8390f69a31f1a976968b9c18d0824d78460db2/ColorPanelPopup.scssc
+++ /dev/null
diff --git a/js/panels/Color/colorchippopup.reel/.sass-cache/de22270a8ac487505e8876f1cd16286e094a5127/ColorPanelBase.scssc b/js/panels/Color/colorchippopup.reel/.sass-cache/de22270a8ac487505e8876f1cd16286e094a5127/ColorPanelBase.scssc
deleted file mode 100755
index fd7938d8..00000000
--- a/js/panels/Color/colorchippopup.reel/.sass-cache/de22270a8ac487505e8876f1cd16286e094a5127/ColorPanelBase.scssc
+++ /dev/null
diff --git a/js/panels/Color/colorbutton-manager.js b/js/panels/color/colorbutton-manager.js
index a189d040..a189d040 100755
--- a/js/panels/Color/colorbutton-manager.js
+++ b/js/panels/color/colorbutton-manager.js
diff --git a/js/panels/Color/colorchippopup.reel/colorchippopup.html b/js/panels/color/colorchippopup.reel/colorchippopup.html
index 1ae40cc1..1ae40cc1 100755
--- a/js/panels/Color/colorchippopup.reel/colorchippopup.html
+++ b/js/panels/color/colorchippopup.reel/colorchippopup.html
diff --git a/js/panels/Color/colorchippopup.reel/colorchippopup.js b/js/panels/color/colorchippopup.reel/colorchippopup.js
index 05bcb447..05bcb447 100755
--- a/js/panels/Color/colorchippopup.reel/colorchippopup.js
+++ b/js/panels/color/colorchippopup.reel/colorchippopup.js
diff --git a/js/panels/Color/colorchippopup.reel/config.rb b/js/panels/color/colorchippopup.reel/config.rb
index 9b55af19..9b55af19 100755
--- a/js/panels/Color/colorchippopup.reel/config.rb
+++ b/js/panels/color/colorchippopup.reel/config.rb
diff --git a/js/panels/Color/colorchippopup.reel/css/colorchippopup.css b/js/panels/color/colorchippopup.reel/css/colorchippopup.css
index 514c8e9f..514c8e9f 100755
--- a/js/panels/Color/colorchippopup.reel/css/colorchippopup.css
+++ b/js/panels/color/colorchippopup.reel/css/colorchippopup.css
diff --git a/js/panels/Color/colorchippopup.reel/css/colorchippopup.scss b/js/panels/color/colorchippopup.reel/css/colorchippopup.scss
index d108c1a8..d108c1a8 100755
--- a/js/panels/Color/colorchippopup.reel/css/colorchippopup.scss
+++ b/js/panels/color/colorchippopup.reel/css/colorchippopup.scss
diff --git a/js/panels/Color/colorchippopup.reel/img/icon_bitmap.png b/js/panels/color/colorchippopup.reel/img/icon_bitmap.png
index 3d6bf1fb..3d6bf1fb 100755
--- a/js/panels/Color/colorchippopup.reel/img/icon_bitmap.png
+++ b/js/panels/color/colorchippopup.reel/img/icon_bitmap.png
diff --git a/js/panels/Color/colorchippopup.reel/img/icon_colorwheel.png b/js/panels/color/colorchippopup.reel/img/icon_colorwheel.png
index a2850f4f..a2850f4f 100755
--- a/js/panels/Color/colorchippopup.reel/img/icon_colorwheel.png
+++ b/js/panels/color/colorchippopup.reel/img/icon_colorwheel.png
diff --git a/js/panels/Color/colorchippopup.reel/img/icon_gradient.png b/js/panels/color/colorchippopup.reel/img/icon_gradient.png
index 887eee13..887eee13 100755
--- a/js/panels/Color/colorchippopup.reel/img/icon_gradient.png
+++ b/js/panels/color/colorchippopup.reel/img/icon_gradient.png
diff --git a/js/panels/Color/colorchippopup.reel/img/icon_nofill.png b/js/panels/color/colorchippopup.reel/img/icon_nofill.png
index 0c6311a0..0c6311a0 100755
--- a/js/panels/Color/colorchippopup.reel/img/icon_nofill.png
+++ b/js/panels/color/colorchippopup.reel/img/icon_nofill.png
diff --git a/js/panels/Color/colorchippopup.reel/img/knob.png b/js/panels/color/colorchippopup.reel/img/knob.png
index ecfbfcec..ecfbfcec 100755
--- a/js/panels/Color/colorchippopup.reel/img/knob.png
+++ b/js/panels/color/colorchippopup.reel/img/knob.png
diff --git a/js/panels/Color/colorpanel.js b/js/panels/color/colorpanel.js
index 3a603e98..3a603e98 100755
--- a/js/panels/Color/colorpanel.js
+++ b/js/panels/color/colorpanel.js
diff --git a/js/panels/Color/colorpanelbase.reel/colorpanelbase.html b/js/panels/color/colorpanelbase.reel/colorpanelbase.html
index d4330596..d4330596 100755
--- a/js/panels/Color/colorpanelbase.reel/colorpanelbase.html
+++ b/js/panels/color/colorpanelbase.reel/colorpanelbase.html
diff --git a/js/panels/Color/colorpanelbase.reel/colorpanelbase.js b/js/panels/color/colorpanelbase.reel/colorpanelbase.js
index af62dd07..af62dd07 100755
--- a/js/panels/Color/colorpanelbase.reel/colorpanelbase.js
+++ b/js/panels/color/colorpanelbase.reel/colorpanelbase.js
diff --git a/js/panels/Color/colorpanelbase.reel/config.rb b/js/panels/color/colorpanelbase.reel/config.rb
index 9b55af19..9b55af19 100755
--- a/js/panels/Color/colorpanelbase.reel/config.rb
+++ b/js/panels/color/colorpanelbase.reel/config.rb
diff --git a/js/panels/Color/colorpanelbase.reel/css/colorpanelbase.css b/js/panels/color/colorpanelbase.reel/css/colorpanelbase.css
index e4a0aa12..e4a0aa12 100755
--- a/js/panels/Color/colorpanelbase.reel/css/colorpanelbase.css
+++ b/js/panels/color/colorpanelbase.reel/css/colorpanelbase.css
diff --git a/js/panels/Color/colorpanelbase.reel/css/colorpanelbase.scss b/js/panels/color/colorpanelbase.reel/css/colorpanelbase.scss
index 70bbc13f..70bbc13f 100755
--- a/js/panels/Color/colorpanelbase.reel/css/colorpanelbase.scss
+++ b/js/panels/color/colorpanelbase.reel/css/colorpanelbase.scss
diff --git a/js/panels/Color/colorpanelbase.reel/img/icon_default.png b/js/panels/color/colorpanelbase.reel/img/icon_default.png
index 8e64991f..8e64991f 100755
--- a/js/panels/Color/colorpanelbase.reel/img/icon_default.png
+++ b/js/panels/color/colorpanelbase.reel/img/icon_default.png
diff --git a/js/panels/Color/colorpanelbase.reel/img/icon_nocolor.png b/js/panels/color/colorpanelbase.reel/img/icon_nocolor.png
index 17164935..17164935 100755
--- a/js/panels/Color/colorpanelbase.reel/img/icon_nocolor.png
+++ b/js/panels/color/colorpanelbase.reel/img/icon_nocolor.png
diff --git a/js/panels/Color/colorpanelbase.reel/img/icon_swap.png b/js/panels/color/colorpanelbase.reel/img/icon_swap.png
index c2c1681d..c2c1681d 100755
--- a/js/panels/Color/colorpanelbase.reel/img/icon_swap.png
+++ b/js/panels/color/colorpanelbase.reel/img/icon_swap.png
diff --git a/js/panels/Color/colorpanelbase.reel/img/knob.png b/js/panels/color/colorpanelbase.reel/img/knob.png
index ecfbfcec..ecfbfcec 100755
--- a/js/panels/Color/colorpanelbase.reel/img/knob.png
+++ b/js/panels/color/colorpanelbase.reel/img/knob.png
diff --git a/js/panels/Color/colorpanelpopup.reel/colorpanelpopup.html b/js/panels/color/colorpanelpopup.reel/colorpanelpopup.html
index feebb45c..feebb45c 100755
--- a/js/panels/Color/colorpanelpopup.reel/colorpanelpopup.html
+++ b/js/panels/color/colorpanelpopup.reel/colorpanelpopup.html
diff --git a/js/panels/Color/colorpanelpopup.reel/colorpanelpopup.js b/js/panels/color/colorpanelpopup.reel/colorpanelpopup.js
index 3eae3ea3..b957d495 100755
--- a/js/panels/Color/colorpanelpopup.reel/colorpanelpopup.js
+++ b/js/panels/color/colorpanelpopup.reel/colorpanelpopup.js
@@ -405,7 +405,7 @@ exports.ColorPanelPopup = Montage.create(Component, {
     //
     defaultGradient: {
         enumerable: true,
-        value: {mode: 'linear', stops: [{mode: 'rgb', value: {r: 255, g: 255, b: 255, a: 1, css: 'rgb(255, 255, 255)'}, position: 0}, {mode: 'rgb', value: {r: 0, g: 0, b: 0, a: 1, css: 'rgb(0, 0, 0)'}, position: 100}]}
+        value: {mode: 'linear', gradientMode: 'linear', stops: [{mode: 'rgb', value: {r: 255, g: 255, b: 255, a: 1, css: 'rgb(255, 255, 255)'}, position: 0}, {mode: 'rgb', value: {r: 0, g: 0, b: 0, a: 1, css: 'rgb(0, 0, 0)'}, position: 100}]}
     },
     ////////////////////////////////////////////////////////////////////
     //
diff --git a/js/panels/Color/colorpanelpopup.reel/config.rb b/js/panels/color/colorpanelpopup.reel/config.rb
index 9b55af19..9b55af19 100755
--- a/js/panels/Color/colorpanelpopup.reel/config.rb
+++ b/js/panels/color/colorpanelpopup.reel/config.rb
diff --git a/js/panels/Color/colorpanelpopup.reel/css/colorpanelpopup.css b/js/panels/color/colorpanelpopup.reel/css/colorpanelpopup.css
index 4db0abff..4db0abff 100755
--- a/js/panels/Color/colorpanelpopup.reel/css/colorpanelpopup.css
+++ b/js/panels/color/colorpanelpopup.reel/css/colorpanelpopup.css
diff --git a/js/panels/Color/colorpanelpopup.reel/css/colorpanelpopup.scss b/js/panels/color/colorpanelpopup.reel/css/colorpanelpopup.scss
index 1f63658a..1f63658a 100755
--- a/js/panels/Color/colorpanelpopup.reel/css/colorpanelpopup.scss
+++ b/js/panels/color/colorpanelpopup.reel/css/colorpanelpopup.scss
diff --git a/js/panels/Color/colorpanelpopup.reel/img/icon_bitmap.png b/js/panels/color/colorpanelpopup.reel/img/icon_bitmap.png
index 3d6bf1fb..3d6bf1fb 100755
--- a/js/panels/Color/colorpanelpopup.reel/img/icon_bitmap.png
+++ b/js/panels/color/colorpanelpopup.reel/img/icon_bitmap.png
diff --git a/js/panels/Color/colorpanelpopup.reel/img/icon_colorwheel.png b/js/panels/color/colorpanelpopup.reel/img/icon_colorwheel.png
index a2850f4f..a2850f4f 100755
--- a/js/panels/Color/colorpanelpopup.reel/img/icon_colorwheel.png
+++ b/js/panels/color/colorpanelpopup.reel/img/icon_colorwheel.png
diff --git a/js/panels/Color/colorpanelpopup.reel/img/icon_gradient.png b/js/panels/color/colorpanelpopup.reel/img/icon_gradient.png
index 887eee13..887eee13 100755
--- a/js/panels/Color/colorpanelpopup.reel/img/icon_gradient.png
+++ b/js/panels/color/colorpanelpopup.reel/img/icon_gradient.png
diff --git a/js/panels/Color/colorpanelpopup.reel/img/icon_nofill.png b/js/panels/color/colorpanelpopup.reel/img/icon_nofill.png
index 0c6311a0..0c6311a0 100755
--- a/js/panels/Color/colorpanelpopup.reel/img/icon_nofill.png
+++ b/js/panels/color/colorpanelpopup.reel/img/icon_nofill.png
diff --git a/js/panels/Color/colorpanelpopup.reel/img/knob.png b/js/panels/color/colorpanelpopup.reel/img/knob.png
index ecfbfcec..ecfbfcec 100755
--- a/js/panels/Color/colorpanelpopup.reel/img/knob.png
+++ b/js/panels/color/colorpanelpopup.reel/img/knob.png
diff --git a/js/panels/Color/colorpopup-manager.js b/js/panels/color/colorpopup-manager.js
index a4c9a8c2..a4c9a8c2 100755
--- a/js/panels/Color/colorpopup-manager.js
+++ b/js/panels/color/colorpopup-manager.js
diff --git a/js/panels/Color/colortoolbar.reel/colortoolbar.html b/js/panels/color/colortoolbar.reel/colortoolbar.html
index 9ab54836..9ab54836 100755
--- a/js/panels/Color/colortoolbar.reel/colortoolbar.html
+++ b/js/panels/color/colortoolbar.reel/colortoolbar.html
diff --git a/js/panels/Color/colortoolbar.reel/colortoolbar.js b/js/panels/color/colortoolbar.reel/colortoolbar.js
index 6b8e476b..6b8e476b 100755
--- a/js/panels/Color/colortoolbar.reel/colortoolbar.js
+++ b/js/panels/color/colortoolbar.reel/colortoolbar.js
diff --git a/js/panels/Color/colortoolbar.reel/config.rb b/js/panels/color/colortoolbar.reel/config.rb
index 9b55af19..9b55af19 100755
--- a/js/panels/Color/colortoolbar.reel/config.rb
+++ b/js/panels/color/colortoolbar.reel/config.rb
diff --git a/js/panels/Color/colortoolbar.reel/css/colortoolbar.css b/js/panels/color/colortoolbar.reel/css/colortoolbar.css
index 759ef4f8..759ef4f8 100755
--- a/js/panels/Color/colortoolbar.reel/css/colortoolbar.css
+++ b/js/panels/color/colortoolbar.reel/css/colortoolbar.css
diff --git a/js/panels/Color/colortoolbar.reel/css/colortoolbar.scss b/js/panels/color/colortoolbar.reel/css/colortoolbar.scss
index 79fb37b6..79fb37b6 100755
--- a/js/panels/Color/colortoolbar.reel/css/colortoolbar.scss
+++ b/js/panels/color/colortoolbar.reel/css/colortoolbar.scss
diff --git a/js/panels/presets/content.reel/content.css b/js/panels/presets/content.reel/content.css
index c0ccbad4..409e1960 100644
--- a/js/panels/presets/content.reel/content.css
+++ b/js/panels/presets/content.reel/content.css
@@ -10,9 +10,7 @@
     -webkit-box-orient: vertical;
     -webkit-box-flex: 1;
 }
-.presetsPanel .treeRoot {
-    margin: 0 8px;
-}
+
 .tab-bar {
     -webkit-box-flex: 0;
     background-color: #282828;
diff --git a/js/panels/properties.reel/properties.js b/js/panels/properties.reel/properties.js
index eb9faa8b..947d7937 100755
--- a/js/panels/properties.reel/properties.js
+++ b/js/panels/properties.reel/properties.js
@@ -302,13 +302,15 @@ exports.Properties = Montage.create(Component, {
                         }
                         else
                         {
-                            currentValue = ElementsMediator.getColor2(el, control.prop, control.valueMutator);