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

Conflicts:
	js/panels/presets/animations-presets.reel/animations-presets.js
	js/panels/presets/style-presets.reel/style-presets.js
	js/panels/presets/transitions-presets.reel/transitions-presets.js

2 files changed, 2 insertions, 2 deletions

diff --git a/scss/imports/scss/_MainWindow.scss b/scss/imports/scss/_MainWindow.scss
index ba9851da..f6068ddb 100755
--- a/scss/imports/scss/_MainWindow.scss
+++ b/scss/imports/scss/_MainWindow.scss
@@ -89,7 +89,7 @@
     min-height:46px;
     max-height:50%;
     overflow:auto;
-
+    -webkit-transition: all 0.15s linear;
 }
 
 .panelContainer {
diff --git a/scss/imports/scss/_PanelUI.scss b/scss/imports/scss/_PanelUI.scss
index f76d3e20..d60dae59 100755
--- a/scss/imports/scss/_PanelUI.scss
+++ b/scss/imports/scss/_PanelUI.scss
@@ -1088,7 +1088,7 @@ button.panel-button {
     margin: -1px 8px 0px 27px;
 }
 .pp_filllabel{
-    border-width: none;
+    border: none;
     margin: -1px 8px 0px 34px;
 }
 //  End Styles for DivPIProperties