Merge branch 'master' into components

Conflicts:
	node_modules/montage/ui/bluemoon/progress.reel/progress.html
	node_modules/montage/ui/image2.reel/image2.html
	node_modules/ninja-components/effect/desaturate-effect.js
	node_modules/ninja-components/effect/effect.js
	node_modules/ninja-components/effect/invert-effect.js
	node_modules/ninja-components/effect/kaliedoscope-effect.js
	node_modules/ninja-components/effect/multiply-effect.js
	node_modules/ninja-components/effect/sepia-effect.js
	node_modules/ninja-components/flow-controller.reel/flow-controller.html
	node_modules/ninja-components/flow-controller.reel/flow-controller.js
	node_modules/ninja-components/flow-offset.js
	node_modules/ninja-components/hottext.reel/hottext.css
	node_modules/ninja-components/hottext.reel/hottext.html
	node_modules/ninja-components/hottext.reel/hottext.js
	node_modules/ninja-components/hottextunit.reel/hottextunit.css
	node_modules/ninja-components/hottextunit.reel/hottextunit.html
	node_modules/ninja-components/hottextunit.reel/hottextunit.js
	node_modules/ninja-components/image2.reel/image2.html
	node_modules/ninja-components/image2.reel/image2.js
	node_modules/ninja-components/image3d.reel/image3d.html
	node_modules/ninja-components/image3d.reel/image3d.js
	node_modules/ninja-components/photo-editor.reel/photo-editor.css
	node_modules/ninja-components/photo-editor.reel/photo-editor.html
	node_modules/ninja-components/photo-editor.reel/photo-editor.js
	node_modules/ninja-components/slider-base.js
	user-document-templates/montage-application-cloud/appdelegate.js

Signed-off-by: Valerio Virgillito <valerio@motorola.com>

1 files changed, 6 insertions, 4 deletions

diff --git a/css/ninja.css b/css/ninja.css
index 9126c1d3..8ce60a10 100644
--- a/css/ninja.css
+++ b/css/ninja.css
@@ -16,7 +16,7 @@
 
 .layout-table .flexor div:last-child { float: right; }
 
-input.nj-skinned, textarea.nj-skinned, button.nj-skinned, select.nj-skinned, select.nj-skinned option, button.nj-skinned { -webkit-appearance: none; outline: none; }
+input.nj-skinned, textarea.nj-skinned, button.nj-skinned, select.nj-skinned, select.nj-skinned option { -webkit-appearance: none; outline: none; }
 
 input[type="text"].nj-skinned, input[type="password"].nj-skinned, input[type="search"].nj-skinned, textarea.nj-skinned, select.nj-skinned, select.nj-skinned option { border: 1px solid #313131; color: white; background-color: #444444; font-size: 12px; font-family: 'Droid Sans', sans-serif; }
 
@@ -34,7 +34,11 @@ input[type="search"].nj-skinned::-webkit-search-cancel-button { -webkit-appearan
 
 input[type="search"].nj-skinned::-webkit-search-cancel-button:after { content: "\2716"; }
 
-button.nj-skinned { font-size: 9px; cursor: pointer; }
+button.nj-skinned { font-size: 9px; cursor: pointer; display: block; border: 0px; margin: 0px; padding: 4px; border: 1px #313131 solid; background-color: #474747; background-image: -webkit-linear-gradient(top, #505050 0%, #3c3c3c 100%); border-radius: 4px; color: white; text-transform: uppercase; cursor: pointer; text-shadow: 1px 1px 1px rgba(0, 0, 0, 0.5); }
+
+button.nj-skinned:active { background-image: -webkit-linear-gradient(top, #3c3c3c 0%, #505050 100%); }
+
+button.nj-skinned:hover { -webkit-box-shadow: 0px 0px 3px #b4b4b4; }
 
 input[type="radio"].nj-skinned { background-color: #474747; background-image: -webkit-linear-gradient(top, #646464 0%, #3c3c3c 100%); color: #c8c8c8; border: 2px solid #282828; width: 12px; height: 12px; overflow: hidden; border-radius: 10px; font-size: 16px; line-height: 7px; text-indent: -7px; cursor: pointer; -webkit-box-shadow: 0px 0px 2px rgba(200, 200, 200, 0.5); -moz-box-shadow: 0px 0px 2px rgba(200, 200, 200, 0.5); box-shadow: 0px 0px 2px rgba(200, 200, 200, 0.5); }
 
@@ -336,8 +340,6 @@ ul.treeComponent > img:first-child { margin-left: -35px; margin-right: 5px; -web
 
 #pp-view-assets { display: none; }
 
-#pp-container-assets .pp-scroll-linked, #pp-container-list .pp-scroll-linked { width: 420px; }
-
 .pp-header-container { position: relative; overflow: hidden; border-bottom: 1px solid black; background-color: #3a3a3a; min-width: 390px; }
 
 .pp-header { border-right: 1px solid black; color: white; padding-top: 4px; padding-left: 6px; font-weight: bold; display: block; float: left; overflow: visible; position: relative; }