From e371bf150da9302c548f356d93a13e54f8122f54 Mon Sep 17 00:00:00 2001
From: John Mayhew
Date: Mon, 30 Jan 2012 10:09:06 -0800
Subject: Removing unused file from assets/images. This file should not have
 been committed initially.

---
 assets/images/Thumbs.db | Bin 7168 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 assets/images/Thumbs.db

diff --git a/assets/images/Thumbs.db b/assets/images/Thumbs.db
deleted file mode 100644
index fa66bbc8..00000000
Binary files a/assets/images/Thumbs.db and /dev/null differ
-- 
cgit v1.2.3


From 4a3793e9cc498219d246e543a55b543e1b4fb708 Mon Sep 17 00:00:00 2001
From: Eric Guzman
Date: Mon, 30 Jan 2012 11:21:15 -0800
Subject: CSSPanel Updates - Add new original CSS error icon

---
 js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.css b/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.css
index ff70b5b6..27d19e58 100644
--- a/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.css
+++ b/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.css
@@ -400,7 +400,7 @@
 .nj-css-error:not(.nj-css-no-error) {
     background-repeat: no-repeat;
     background-position: 3px 2px;
-    background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAAAXNSR0IArs4c6QAAAMtJREFUGJV1kM0KAXEUxc/SWh7MM0zJE3gQCxM2EpJ8bEiNjWHhBWYjYkUkRdQoGde5f2Q03PrV6ZzTrXuB0MgQiU0ba0U1/k3gwBYXoqj+WeKG2LaBgwxYJEbTixa7yMyLLPlLw6xATS9SXDWx25cZ7sYG1ep9b3OR8h3cTyUWtyMylnMNcqGn2WdbHQs94FqFnPtxg2r1NHsfkTx0EMiEG7IMpy2D0fSOPWbsgD/zzEtoik323hP75THTDvJpVHIW5I1t4aaEPe08AF+CuEXWXJtHAAAAAElFTkSuQmCC);
+    background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAALCAYAAABGbhwYAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyRpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw%2FeHBhY2tldCBiZWdpbj0i77u%2FIiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8%2BIDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMC1jMDYxIDY0LjE0MDk0OSwgMjAxMC8xMi8wNy0xMDo1NzowMSAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNS4xIE1hY2ludG9zaCIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDowMzYyMERFNTQwNzMxMUUxQTREQ0IxQTRGNEI2MTE3RiIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDowMzYyMERFNjQwNzMxMUUxQTREQ0IxQTRGNEI2MTE3RiI%2BIDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOjAzNjIwREUzNDA3MzExRTFBNERDQjFBNEY0QjYxMTdGIiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOjAzNjIwREU0NDA3MzExRTFBNERDQjFBNEY0QjYxMTdGIi8%2BIDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY%2BIDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8%2Bc4fwegAAAWpJREFUeNo8kLtLA0EQxr%2B9l3lcDAaCBsEqEOysBFEQsRAsRVCEpBREsbIUSxtBrAxEewsrK8VHQIhK%2FoIUUVJIQFFjYi65XDZ36%2Bz5GFgWZr75fjPDhBD4C%2BucjWgaphjQdTgK%2FfPi5a%2FGpPDtjEVjERyqKlag%2FlY8gHPsfzSwPbQgbDyfIs6vURa3EKK8Jf6jmhUy51yiWDlBUDED2NF0JKGQS3IPVn4ATXqIL0EYJgwD42YQG4quE45EggOtCwbWrUM1Ej%2F0jkXDAYaOtOa6iIH2YSQOBugPj4KN3aFdnIThkprynoeUYjtwIRO0hCLxiU3wp12odgl0AXhUa3VQ0xoWCqEApiNhEpFzt7Tm%2F4Tzo9kGvtq4UjNzqJB1mswURvNoqayP57V7KcB7HfZnE8v%2BHYtZtmiGcBzqQ1TSZUPP85HVlo1MfCaX94WPpSO83qwO6wbWCTtBQocoD70eDgZncw3Z%2BC3AAFMzlxlnnpevAAAAAElFTkSuQmCC);
     opacity: 0.5;
 }
 .nj-editing.nj-css-error {
-- 
cgit v1.2.3


From 13ceef38109c0e851fcc499c361e651384f67b99 Mon Sep 17 00:00:00 2001
From: John Mayhew
Date: Mon, 30 Jan 2012 13:24:47 -0800
Subject: Removed unused images and reduced the size of the larger image files
 used for shaders.

---
 assets/images/BasePlatformA01_AO.png | Bin 65754 -> 0 bytes
 assets/images/BasePlatformA01_DM.png | Bin 70207 -> 0 bytes
 assets/images/BoxA01_AO.png          | Bin 62516 -> 0 bytes
 assets/images/BoxA01_DM.png          | Bin 54892 -> 0 bytes
 assets/images/Grunge.png             | Bin 2174259 -> 0 bytes
 assets/images/LabelFrame.tga         | Bin 12306 -> 0 bytes
 assets/images/MArmBaseN_DM.png       | Bin 136280 -> 0 bytes
 assets/images/MArmBaseN_NM.png       | Bin 109974 -> 0 bytes
 assets/images/MArmTopN_DM.png        | Bin 136902 -> 0 bytes
 assets/images/MArmTopN_NM.png        | Bin 97275 -> 0 bytes
 assets/images/MArm_AO.png            | Bin 157336 -> 0 bytes
 assets/images/MBaseWallA01_AO.png    | Bin 134056 -> 0 bytes
 assets/images/MBaseWallA01_DM.png    | Bin 136022 -> 0 bytes
 assets/images/MBaseWallA01_GM.png    | Bin 26051 -> 0 bytes
 assets/images/MBase_AO.png           | Bin 165449 -> 0 bytes
 assets/images/MCoreBase_DM.png       | Bin 130589 -> 0 bytes
 assets/images/MCoreBase_GM.png       | Bin 9853 -> 0 bytes
 assets/images/MEjectorBaseN_DM.png   | Bin 119768 -> 0 bytes
 assets/images/MEjectorBaseN_NM.png   | Bin 57808 -> 0 bytes
 assets/images/MRingBaseN_DM.png      | Bin 107671 -> 0 bytes
 assets/images/MRingBaseN_NM.png      | Bin 94852 -> 0 bytes
 assets/images/MSquareBaseN_DM.png    | Bin 76400 -> 0 bytes
 assets/images/MWall_AO.png           | Bin 108536 -> 0 bytes
 assets/images/MWall_DM.png           | Bin 133125 -> 0 bytes
 assets/images/MWall_GM.png           | Bin 9294 -> 0 bytes
 assets/images/MWall_NM.png           | Bin 89287 -> 0 bytes
 assets/images/Ref.png                | Bin 13632 -> 0 bytes
 assets/images/Spec.png               | Bin 2321526 -> 0 bytes
 assets/images/black.tga              | Bin 210 -> 0 bytes
 assets/images/cube.png               | Bin 34506 -> 0 bytes
 assets/images/cubelight_Glow.png     | Bin 3635 -> 0 bytes
 assets/images/cubelight_spec.png     | Bin 33249 -> 0 bytes
 assets/images/default_white.png      | Bin 90 -> 0 bytes
 assets/images/droid.png              | Bin 885 -> 0 bytes
 assets/images/env.png                | Bin 85724 -> 0 bytes
 assets/images/femaleRobot.png        | Bin 2857 -> 0 bytes
 assets/images/femaleRobot_Glow.png   | Bin 2855 -> 0 bytes
 assets/images/lightRack.png          | Bin 2857 -> 0 bytes
 assets/images/lightRack_Glow.png     | Bin 2857 -> 0 bytes
 assets/images/metal.png              | Bin 2366049 -> 696663 bytes
 assets/images/particle-star.png      | Bin 3665 -> 0 bytes
 assets/images/quilt01.png            | Bin 572888 -> 0 bytes
 assets/images/quilt01_E.png          | Bin 3273 -> 0 bytes
 assets/images/quilt01_N.png          | Bin 116034 -> 0 bytes
 assets/images/quilt02.png            | Bin 391471 -> 0 bytes
 assets/images/quilt02_E.png          | Bin 3273 -> 0 bytes
 assets/images/quilt02_N.png          | Bin 34939 -> 0 bytes
 assets/images/white.tga              | Bin 236 -> 0 bytes
 48 files changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 assets/images/BasePlatformA01_AO.png
 delete mode 100644 assets/images/BasePlatformA01_DM.png
 delete mode 100644 assets/images/BoxA01_AO.png
 delete mode 100644 assets/images/BoxA01_DM.png
 delete mode 100644 assets/images/Grunge.png
 delete mode 100644 assets/images/LabelFrame.tga
 delete mode 100644 assets/images/MArmBaseN_DM.png
 delete mode 100644 assets/images/MArmBaseN_NM.png
 delete mode 100644 assets/images/MArmTopN_DM.png
 delete mode 100644 assets/images/MArmTopN_NM.png
 delete mode 100644 assets/images/MArm_AO.png
 delete mode 100644 assets/images/MBaseWallA01_AO.png
 delete mode 100644 assets/images/MBaseWallA01_DM.png
 delete mode 100644 assets/images/MBaseWallA01_GM.png
 delete mode 100644 assets/images/MBase_AO.png
 delete mode 100644 assets/images/MCoreBase_DM.png
 delete mode 100644 assets/images/MCoreBase_GM.png
 delete mode 100644 assets/images/MEjectorBaseN_DM.png
 delete mode 100644 assets/images/MEjectorBaseN_NM.png
 delete mode 100644 assets/images/MRingBaseN_DM.png
 delete mode 100644 assets/images/MRingBaseN_NM.png
 delete mode 100644 assets/images/MSquareBaseN_DM.png
 delete mode 100644 assets/images/MWall_AO.png
 delete mode 100644 assets/images/MWall_DM.png
 delete mode 100644 assets/images/MWall_GM.png
 delete mode 100644 assets/images/MWall_NM.png
 delete mode 100644 assets/images/Ref.png
 delete mode 100644 assets/images/Spec.png
 delete mode 100644 assets/images/black.tga
 delete mode 100644 assets/images/cube.png
 delete mode 100644 assets/images/cubelight_Glow.png
 delete mode 100644 assets/images/cubelight_spec.png
 delete mode 100644 assets/images/default_white.png
 delete mode 100644 assets/images/droid.png
 delete mode 100644 assets/images/env.png
 delete mode 100644 assets/images/femaleRobot.png
 delete mode 100644 assets/images/femaleRobot_Glow.png
 delete mode 100644 assets/images/lightRack.png
 delete mode 100644 assets/images/lightRack_Glow.png
 delete mode 100644 assets/images/particle-star.png
 delete mode 100644 assets/images/quilt01.png
 delete mode 100644 assets/images/quilt01_E.png
 delete mode 100644 assets/images/quilt01_N.png
 delete mode 100644 assets/images/quilt02.png
 delete mode 100644 assets/images/quilt02_E.png
 delete mode 100644 assets/images/quilt02_N.png
 delete mode 100644 assets/images/white.tga

diff --git a/assets/images/BasePlatformA01_AO.png b/assets/images/BasePlatformA01_AO.png
deleted file mode 100644
index 11f74245..00000000
Binary files a/assets/images/BasePlatformA01_AO.png and /dev/null differ
diff --git a/assets/images/BasePlatformA01_DM.png b/assets/images/BasePlatformA01_DM.png
deleted file mode 100644
index f367ccb7..00000000
Binary files a/assets/images/BasePlatformA01_DM.png and /dev/null differ
diff --git a/assets/images/BoxA01_AO.png b/assets/images/BoxA01_AO.png
deleted file mode 100644
index 60a88883..00000000
Binary files a/assets/images/BoxA01_AO.png and /dev/null differ
diff --git a/assets/images/BoxA01_DM.png b/assets/images/BoxA01_DM.png
deleted file mode 100644
index cc6f6165..00000000
Binary files a/assets/images/BoxA01_DM.png and /dev/null differ
diff --git a/assets/images/Grunge.png b/assets/images/Grunge.png
deleted file mode 100644
index 49ff48e9..00000000
Binary files a/assets/images/Grunge.png and /dev/null differ
diff --git a/assets/images/LabelFrame.tga b/assets/images/LabelFrame.tga
deleted file mode 100644
index 7e3326bd..00000000
Binary files a/assets/images/LabelFrame.tga and /dev/null differ
diff --git a/assets/images/MArmBaseN_DM.png b/assets/images/MArmBaseN_DM.png
deleted file mode 100644
index 6845b555..00000000
Binary files a/assets/images/MArmBaseN_DM.png and /dev/null differ
diff --git a/assets/images/MArmBaseN_NM.png b/assets/images/MArmBaseN_NM.png
deleted file mode 100644
index 5009b0ec..00000000
Binary files a/assets/images/MArmBaseN_NM.png and /dev/null differ
diff --git a/assets/images/MArmTopN_DM.png b/assets/images/MArmTopN_DM.png
deleted file mode 100644
index ef3511b3..00000000
Binary files a/assets/images/MArmTopN_DM.png and /dev/null differ
diff --git a/assets/images/MArmTopN_NM.png b/assets/images/MArmTopN_NM.png
deleted file mode 100644
index 489c92db..00000000
Binary files a/assets/images/MArmTopN_NM.png and /dev/null differ
diff --git a/assets/images/MArm_AO.png b/assets/images/MArm_AO.png
deleted file mode 100644
index be27c8cb..00000000
Binary files a/assets/images/MArm_AO.png and /dev/null differ
diff --git a/assets/images/MBaseWallA01_AO.png b/assets/images/MBaseWallA01_AO.png
deleted file mode 100644
index d68e4209..00000000
Binary files a/assets/images/MBaseWallA01_AO.png and /dev/null differ
diff --git a/assets/images/MBaseWallA01_DM.png b/assets/images/MBaseWallA01_DM.png
deleted file mode 100644
index 02a31e16..00000000
Binary files a/assets/images/MBaseWallA01_DM.png and /dev/null differ
diff --git a/assets/images/MBaseWallA01_GM.png b/assets/images/MBaseWallA01_GM.png
deleted file mode 100644
index 726453ae..00000000
Binary files a/assets/images/MBaseWallA01_GM.png and /dev/null differ
diff --git a/assets/images/MBase_AO.png b/assets/images/MBase_AO.png
deleted file mode 100644
index 12d763da..00000000
Binary files a/assets/images/MBase_AO.png and /dev/null differ
diff --git a/assets/images/MCoreBase_DM.png b/assets/images/MCoreBase_DM.png
deleted file mode 100644
index 4d0ec6dd..00000000
Binary files a/assets/images/MCoreBase_DM.png and /dev/null differ
diff --git a/assets/images/MCoreBase_GM.png b/assets/images/MCoreBase_GM.png
deleted file mode 100644
index 81d464ec..00000000
Binary files a/assets/images/MCoreBase_GM.png and /dev/null differ
diff --git a/assets/images/MEjectorBaseN_DM.png b/assets/images/MEjectorBaseN_DM.png
deleted file mode 100644
index 1832c522..00000000
Binary files a/assets/images/MEjectorBaseN_DM.png and /dev/null differ
diff --git a/assets/images/MEjectorBaseN_NM.png b/assets/images/MEjectorBaseN_NM.png
deleted file mode 100644
index 4f7560d3..00000000
Binary files a/assets/images/MEjectorBaseN_NM.png and /dev/null differ
diff --git a/assets/images/MRingBaseN_DM.png b/assets/images/MRingBaseN_DM.png
deleted file mode 100644
index f8a4aebe..00000000
Binary files a/assets/images/MRingBaseN_DM.png and /dev/null differ
diff --git a/assets/images/MRingBaseN_NM.png b/assets/images/MRingBaseN_NM.png
deleted file mode 100644
index c9242acb..00000000
Binary files a/assets/images/MRingBaseN_NM.png and /dev/null differ
diff --git a/assets/images/MSquareBaseN_DM.png b/assets/images/MSquareBaseN_DM.png
deleted file mode 100644
index 5576eff0..00000000
Binary files a/assets/images/MSquareBaseN_DM.png and /dev/null differ
diff --git a/assets/images/MWall_AO.png b/assets/images/MWall_AO.png
deleted file mode 100644
index e5d5a684..00000000
Binary files a/assets/images/MWall_AO.png and /dev/null differ
diff --git a/assets/images/MWall_DM.png b/assets/images/MWall_DM.png
deleted file mode 100644
index b735de01..00000000
Binary files a/assets/images/MWall_DM.png and /dev/null differ
diff --git a/assets/images/MWall_GM.png b/assets/images/MWall_GM.png
deleted file mode 100644
index 2cd56c3d..00000000
Binary files a/assets/images/MWall_GM.png and /dev/null differ
diff --git a/assets/images/MWall_NM.png b/assets/images/MWall_NM.png
deleted file mode 100644
index 2650bc07..00000000
Binary files a/assets/images/MWall_NM.png and /dev/null differ
diff --git a/assets/images/Ref.png b/assets/images/Ref.png
deleted file mode 100644
index 226e4200..00000000
Binary files a/assets/images/Ref.png and /dev/null differ
diff --git a/assets/images/Spec.png b/assets/images/Spec.png
deleted file mode 100644
index 76658540..00000000
Binary files a/assets/images/Spec.png and /dev/null differ
diff --git a/assets/images/black.tga b/assets/images/black.tga
deleted file mode 100644
index 69124ff0..00000000
Binary files a/assets/images/black.tga and /dev/null differ
diff --git a/assets/images/cube.png b/assets/images/cube.png
deleted file mode 100644
index 6cb3ef82..00000000
Binary files a/assets/images/cube.png and /dev/null differ
diff --git a/assets/images/cubelight_Glow.png b/assets/images/cubelight_Glow.png
deleted file mode 100644
index 4f8c922f..00000000
Binary files a/assets/images/cubelight_Glow.png and /dev/null differ
diff --git a/assets/images/cubelight_spec.png b/assets/images/cubelight_spec.png
deleted file mode 100644
index 5cfe820b..00000000
Binary files a/assets/images/cubelight_spec.png and /dev/null differ
diff --git a/assets/images/default_white.png b/assets/images/default_white.png
deleted file mode 100644
index cca49ba7..00000000
Binary files a/assets/images/default_white.png and /dev/null differ
diff --git a/assets/images/droid.png b/assets/images/droid.png
deleted file mode 100644
index 9cba133e..00000000
Binary files a/assets/images/droid.png and /dev/null differ
diff --git a/assets/images/env.png b/assets/images/env.png
deleted file mode 100644
index 72bba813..00000000
Binary files a/assets/images/env.png and /dev/null differ
diff --git a/assets/images/femaleRobot.png b/assets/images/femaleRobot.png
deleted file mode 100644
index 30b153b4..00000000
Binary files a/assets/images/femaleRobot.png and /dev/null differ
diff --git a/assets/images/femaleRobot_Glow.png b/assets/images/femaleRobot_Glow.png
deleted file mode 100644
index 1141f521..00000000
Binary files a/assets/images/femaleRobot_Glow.png and /dev/null differ
diff --git a/assets/images/lightRack.png b/assets/images/lightRack.png
deleted file mode 100644
index 30b153b4..00000000
Binary files a/assets/images/lightRack.png and /dev/null differ
diff --git a/assets/images/lightRack_Glow.png b/assets/images/lightRack_Glow.png
deleted file mode 100644
index 30b153b4..00000000
Binary files a/assets/images/lightRack_Glow.png and /dev/null differ
diff --git a/assets/images/metal.png b/assets/images/metal.png
index d753bec4..ab36aaac 100644
Binary files a/assets/images/metal.png and b/assets/images/metal.png differ
diff --git a/assets/images/particle-star.png b/assets/images/particle-star.png
deleted file mode 100644
index 7da25295..00000000
Binary files a/assets/images/particle-star.png and /dev/null differ
diff --git a/assets/images/quilt01.png b/assets/images/quilt01.png
deleted file mode 100644
index 9c14865f..00000000
Binary files a/assets/images/quilt01.png and /dev/null differ
diff --git a/assets/images/quilt01_E.png b/assets/images/quilt01_E.png
deleted file mode 100644
index 2dbafd27..00000000
Binary files a/assets/images/quilt01_E.png and /dev/null differ
diff --git a/assets/images/quilt01_N.png b/assets/images/quilt01_N.png
deleted file mode 100644
index 801cd09d..00000000
Binary files a/assets/images/quilt01_N.png and /dev/null differ
diff --git a/assets/images/quilt02.png b/assets/images/quilt02.png
deleted file mode 100644
index 4b1bf2ed..00000000
Binary files a/assets/images/quilt02.png and /dev/null differ
diff --git a/assets/images/quilt02_E.png b/assets/images/quilt02_E.png
deleted file mode 100644
index 2dbafd27..00000000
Binary files a/assets/images/quilt02_E.png and /dev/null differ
diff --git a/assets/images/quilt02_N.png b/assets/images/quilt02_N.png
deleted file mode 100644
index 136d1008..00000000
Binary files a/assets/images/quilt02_N.png and /dev/null differ
diff --git a/assets/images/white.tga b/assets/images/white.tga
deleted file mode 100644
index a40a0a2b..00000000
Binary files a/assets/images/white.tga and /dev/null differ
-- 
cgit v1.2.3


From b125c02c3d2e28cc9364d16e23791cd6b540f17c Mon Sep 17 00:00:00 2001
From: Jose Antonio Marquez
Date: Mon, 30 Jan 2012 15:18:50 -0800
Subject: IKNINJA-1083

Fixing minor bug with no color breaking on null alpha value.
---
 js/panels/Color/colorchippopup.reel/colorchippopup.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/panels/Color/colorchippopup.reel/colorchippopup.js b/js/panels/Color/colorchippopup.reel/colorchippopup.js
index 03e14b28..05bcb447 100644
--- a/js/panels/Color/colorchippopup.reel/colorchippopup.js
+++ b/js/panels/Color/colorchippopup.reel/colorchippopup.js
@@ -109,7 +109,7 @@ exports.ColorChipPopup = Montage.create(Component, {
    			this.cc_hexinput.labelFunction = this._hexLabel.bind(this);
     		this.cc_hexinput.inputFunction = this._hexInput.bind(this);
    			//
-   			if (this.application.ninja.colorController.colorView.currentChip && this.application.ninja.colorController.colorView.currentChip.colorValue.a) {
+   			if (this.application.ninja.colorController.colorView.currentChip && this.application.ninja.colorController.colorView.currentChip.colorValue && this.application.ninja.colorController.colorView.currentChip.colorValue.a) {
    				this.combo.slider.value = Math.round(this.application.ninja.colorController.colorView.currentChip.colorValue.a*100);
    			} else {
    				this.combo.slider.value = 100;
-- 
cgit v1.2.3


From 05bb7a317356a71ede049be24a60b5fcaf0a41f9 Mon Sep 17 00:00:00 2001
From: Valerio Virgillito
Date: Mon, 30 Jan 2012 16:35:59 -0800
Subject: Adding a version json object to Ninja

Versions object to start keeping track of versions for Ninja, Montage and eventually other dependencies.
Loaded before montage to use in the splash screen.

Signed-off-by: Valerio Virgillito <rmwh84@motorola.com>
---
 index.html             | 18 +++++++++++++++++-
 js/ninja.reel/ninja.js |  1 +
 versions.json          |  8 ++++++++
 3 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 versions.json

diff --git a/index.html b/index.html
index 44f8ec7e..5fa4790c 100644
--- a/index.html
+++ b/index.html
@@ -168,11 +168,27 @@
 		
 		<script type="text/javascript">
 			window.onload = function() {
+                // Load the version json
+                var req = new XMLHttpRequest();
+                req.open("GET", "versions.json");
+                req.onreadystatechange = (function(req) {
+                    return function(event) {
+                        if (req.readyState === 4) {
+                            if (req.status === 200) {
+                                window.ninjaVersion = JSON.parse(req.responseText);
+                            } else {
+                                console.log("Ninja version file could not be loaded");
+                            }
+                        }
+                    }
+                })(req);
+                req.send();
 				//
 				var star = document.getElementById('star');
 				//
 				njstar(star.getContext("2d"));
-			}
+			};
+
 			function njstar (ctx) {
 				ctx.save();
 				ctx.translate(0,0);
diff --git a/js/ninja.reel/ninja.js b/js/ninja.reel/ninja.js
index bc31e0e1..75ec7fcc 100644
--- a/js/ninja.reel/ninja.js
+++ b/js/ninja.reel/ninja.js
@@ -36,6 +36,7 @@ exports.Ninja = Montage.create(Component, {
 
     prepareForDraw: {
         value: function() {
+            console.log("Loading Ninja --> ", window.ninjaVersion.ninja.version);
 
             this.application.ninja = this;
 
diff --git a/versions.json b/versions.json
new file mode 100644
index 00000000..2d568314
--- /dev/null
+++ b/versions.json
@@ -0,0 +1,8 @@
+{
+    "ninja": {
+        "version": "0.5.0"
+    },
+    "montage": {
+        "version": "0.5.1"
+    }
+}
\ No newline at end of file
-- 
cgit v1.2.3


From 36e7379c7c282fc3e1b5b86b0b0ed59be60c4253 Mon Sep 17 00:00:00 2001
From: Valerio Virgillito
Date: Mon, 30 Jan 2012 16:36:31 -0800
Subject: Code cleanup - Removed extra log.

Signed-off-by: Valerio Virgillito <rmwh84@motorola.com>
---
 js/preloader/Preloader.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/js/preloader/Preloader.js b/js/preloader/Preloader.js
index f137f4b6..93d71e8f 100755
--- a/js/preloader/Preloader.js
+++ b/js/preloader/Preloader.js
@@ -136,7 +136,6 @@ exports.Preloader = Montage.create(Component, {
 
     deserializedFromTemplate: {
         value: function() {
-            console.log("Start Preloading");
 
             this.filesTotal = this.ninjaJsRequire.length + this.ninjaCssRequire.length;
 
-- 
cgit v1.2.3


From 086ade64bb2f5bcc7b6126b5e83c4efccc10ef43 Mon Sep 17 00:00:00 2001
From: Valerio Virgillito
Date: Tue, 31 Jan 2012 08:35:59 +0800
Subject: Adding a version json object to Ninja

Versions object to start keeping track of versions for Ninja, Montage and eventually other dependencies.
Loaded before montage to use in the splash screen.

Signed-off-by: Valerio Virgillito <rmwh84@motorola.com>
---
 index.html             | 18 +++++++++++++++++-
 js/ninja.reel/ninja.js |  1 +
 versions.json          |  8 ++++++++
 3 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 versions.json

diff --git a/index.html b/index.html
index 44f8ec7e..5fa4790c 100644
--- a/index.html
+++ b/index.html
@@ -168,11 +168,27 @@
 		
 		<script type="text/javascript">
 			window.onload = function() {
+                // Load the version json
+                var req = new XMLHttpRequest();
+                req.open("GET", "versions.json");
+                req.onreadystatechange = (function(req) {
+                    return function(event) {
+                        if (req.readyState === 4) {
+                            if (req.status === 200) {
+                                window.ninjaVersion = JSON.parse(req.responseText);
+                            } else {
+                                console.log("Ninja version file could not be loaded");
+                            }
+                        }
+                    }
+                })(req);
+                req.send();
 				//
 				var star = document.getElementById('star');
 				//
 				njstar(star.getContext("2d"));
-			}
+			};
+
 			function njstar (ctx) {
 				ctx.save();
 				ctx.translate(0,0);
diff --git a/js/ninja.reel/ninja.js b/js/ninja.reel/ninja.js
index bc31e0e1..75ec7fcc 100644
--- a/js/ninja.reel/ninja.js
+++ b/js/ninja.reel/ninja.js
@@ -36,6 +36,7 @@ exports.Ninja = Montage.create(Component, {
 
     prepareForDraw: {
         value: function() {
+            console.log("Loading Ninja --> ", window.ninjaVersion.ninja.version);
 
             this.application.ninja = this;
 
diff --git a/versions.json b/versions.json
new file mode 100644
index 00000000..2d568314
--- /dev/null
+++ b/versions.json
@@ -0,0 +1,8 @@
+{
+    "ninja": {
+        "version": "0.5.0"
+    },
+    "montage": {
+        "version": "0.5.1"
+    }
+}
\ No newline at end of file
-- 
cgit v1.2.3


From a4fcd3237432a361e9a07c7fe3d75128e6c99d1c Mon Sep 17 00:00:00 2001
From: Valerio Virgillito
Date: Tue, 31 Jan 2012 08:36:31 +0800
Subject: Code cleanup - Removed extra log.

Signed-off-by: Valerio Virgillito <rmwh84@motorola.com>
---
 js/preloader/Preloader.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/js/preloader/Preloader.js b/js/preloader/Preloader.js
index f137f4b6..93d71e8f 100755
--- a/js/preloader/Preloader.js
+++ b/js/preloader/Preloader.js
@@ -136,7 +136,6 @@ exports.Preloader = Montage.create(Component, {
 
     deserializedFromTemplate: {
         value: function() {
-            console.log("Start Preloading");
 
             this.filesTotal = this.ninjaJsRequire.length + this.ninjaCssRequire.length;
 
-- 
cgit v1.2.3


From df018322f823392fd7da56a42cddcab5473b0f0a Mon Sep 17 00:00:00 2001
From: Valerio Virgillito
Date: Tue, 31 Jan 2012 08:57:57 +0800
Subject: Adding the version to the main Ninja reel component.

Signed-off-by: Valerio Virgillito <rmwh84@motorola.com>
---
 js/ninja.reel/ninja.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/js/ninja.reel/ninja.js b/js/ninja.reel/ninja.js
index 75ec7fcc..465533cd 100644
--- a/js/ninja.reel/ninja.js
+++ b/js/ninja.reel/ninja.js
@@ -13,6 +13,10 @@ exports.Ninja = Montage.create(Component, {
     _appLoaded: { value: false },
     _preload: { value: false },
 
+    ninjaVersion: {
+        value: window.ninjaVersion.ninja.version
+    },
+
     toolsData: { value: null },
     appData:    { value: AppData },
 
@@ -36,7 +40,7 @@ exports.Ninja = Montage.create(Component, {
 
     prepareForDraw: {
         value: function() {
-            console.log("Loading Ninja --> ", window.ninjaVersion.ninja.version);
+            console.log("Loading Ninja --> ", this.ninjaVersion);
 
             this.application.ninja = this;
 
-- 
cgit v1.2.3


From e7f43774b980313392bc1a203431e30958c6e366 Mon Sep 17 00:00:00 2001
From: Valerio Virgillito
Date: Tue, 31 Jan 2012 08:35:59 +0800
Subject: Adding a version json object to Ninja

Versions object to start keeping track of versions for Ninja, Montage and eventually other dependencies.
Loaded before montage to use in the splash screen.

Signed-off-by: Valerio Virgillito <rmwh84@motorola.com>
---
 index.html             | 18 +++++++++++++++++-
 js/ninja.reel/ninja.js |  1 +
 versions.json          |  8 ++++++++
 3 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 versions.json

diff --git a/index.html b/index.html
index 44f8ec7e..5fa4790c 100644
--- a/index.html
+++ b/index.html
@@ -168,11 +168,27 @@
 		
 		<script type="text/javascript">
 			window.onload = function() {
+                // Load the version json
+                var req = new XMLHttpRequest();
+                req.open("GET", "versions.json");
+                req.onreadystatechange = (function(req) {
+                    return function(event) {
+                        if (req.readyState === 4) {
+                            if (req.status === 200) {
+                                window.ninjaVersion = JSON.parse(req.responseText);
+                            } else {
+                                console.log("Ninja version file could not be loaded");
+                            }
+                        }
+                    }
+                })(req);
+                req.send();
 				//
 				var star = document.getElementById('star');
 				//
 				njstar(star.getContext("2d"));
-			}
+			};
+
 			function njstar (ctx) {
 				ctx.save();
 				ctx.translate(0,0);
diff --git a/js/ninja.reel/ninja.js b/js/ninja.reel/ninja.js
index bc31e0e1..75ec7fcc 100644
--- a/js/ninja.reel/ninja.js
+++ b/js/ninja.reel/ninja.js
@@ -36,6 +36,7 @@ exports.Ninja = Montage.create(Component, {
 
     prepareForDraw: {
         value: function() {
+            console.log("Loading Ninja --> ", window.ninjaVersion.ninja.version);
 
             this.application.ninja = this;
 
diff --git a/versions.json b/versions.json
new file mode 100644
index 00000000..2d568314
--- /dev/null
+++ b/versions.json
@@ -0,0 +1,8 @@
+{
+    "ninja": {
+        "version": "0.5.0"
+    },
+    "montage": {
+        "version": "0.5.1"
+    }
+}
\ No newline at end of file
-- 
cgit v1.2.3


From 9425f73ade7908c7cdf2f6247ea18b2bff163613 Mon Sep 17 00:00:00 2001
From: Valerio Virgillito
Date: Tue, 31 Jan 2012 08:36:31 +0800
Subject: Code cleanup - Removed extra log.

Signed-off-by: Valerio Virgillito <rmwh84@motorola.com>
---
 js/preloader/Preloader.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/js/preloader/Preloader.js b/js/preloader/Preloader.js
index f137f4b6..93d71e8f 100755
--- a/js/preloader/Preloader.js
+++ b/js/preloader/Preloader.js
@@ -136,7 +136,6 @@ exports.Preloader = Montage.create(Component, {
 
     deserializedFromTemplate: {
         value: function() {
-            console.log("Start Preloading");
 
             this.filesTotal = this.ninjaJsRequire.length + this.ninjaCssRequire.length;
 
-- 
cgit v1.2.3


From fc8d63ff3a3e2c32f6f11a92741552774301b761 Mon Sep 17 00:00:00 2001
From: Valerio Virgillito
Date: Tue, 31 Jan 2012 08:57:57 +0800
Subject: Adding the version to the main Ninja reel component.

Signed-off-by: Valerio Virgillito <rmwh84@motorola.com>
---
 js/ninja.reel/ninja.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/js/ninja.reel/ninja.js b/js/ninja.reel/ninja.js
index 75ec7fcc..465533cd 100644
--- a/js/ninja.reel/ninja.js
+++ b/js/ninja.reel/ninja.js
@@ -13,6 +13,10 @@ exports.Ninja = Montage.create(Component, {
     _appLoaded: { value: false },
     _preload: { value: false },
 
+    ninjaVersion: {
+        value: window.ninjaVersion.ninja.version
+    },
+
     toolsData: { value: null },
     appData:    { value: AppData },
 
@@ -36,7 +40,7 @@ exports.Ninja = Montage.create(Component, {
 
     prepareForDraw: {
         value: function() {
-            console.log("Loading Ninja --> ", window.ninjaVersion.ninja.version);
+            console.log("Loading Ninja --> ", this.ninjaVersion);
 
             this.application.ninja = this;
 
-- 
cgit v1.2.3


From 98bd02216abf6d550fbb4ed01658c0f273fc9dc5 Mon Sep 17 00:00:00 2001
From: Valerio Virgillito
Date: Tue, 31 Jan 2012 08:57:57 +0800
Subject: Adding the version to the main Ninja reel component.

Signed-off-by: Valerio Virgillito <rmwh84@motorola.com>
---
 js/ninja.reel/ninja.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/js/ninja.reel/ninja.js b/js/ninja.reel/ninja.js
index 75ec7fcc..465533cd 100644
--- a/js/ninja.reel/ninja.js
+++ b/js/ninja.reel/ninja.js
@@ -13,6 +13,10 @@ exports.Ninja = Montage.create(Component, {
     _appLoaded: { value: false },
     _preload: { value: false },
 
+    ninjaVersion: {
+        value: window.ninjaVersion.ninja.version
+    },
+
     toolsData: { value: null },
     appData:    { value: AppData },
 
@@ -36,7 +40,7 @@ exports.Ninja = Montage.create(Component, {
 
     prepareForDraw: {
         value: function() {
-            console.log("Loading Ninja --> ", window.ninjaVersion.ninja.version);
+            console.log("Loading Ninja --> ", this.ninjaVersion);
 
             this.application.ninja = this;
 
-- 
cgit v1.2.3


From a46e1ba07cccc2fbf1c81c1d35308971440a3968 Mon Sep 17 00:00:00 2001
From: Valerio Virgillito
Date: Mon, 30 Jan 2012 23:08:42 -0800
Subject: Adding browser check for Chrome and redirect page.

Adding a check for Google Chrome browser and a redirect page to download and install Chrome.

Signed-off-by: Valerio Virgillito <valerio@motorola.com>
---
 index.html    |  4 ++++
 redirect.html | 23 +++++++++++++++++++++++
 2 files changed, 27 insertions(+)
 create mode 100644 redirect.html

diff --git a/index.html b/index.html
index 5fa4790c..f3018823 100644
--- a/index.html
+++ b/index.html
@@ -168,6 +168,10 @@
 		
 		<script type="text/javascript">
 			window.onload = function() {
+                // Check if we are running in Chrome
+                if(navigator.userAgent.toLowerCase().indexOf("chrome") === -1) {
+                    window.location = "./redirect.html";
+                }
                 // Load the version json
                 var req = new XMLHttpRequest();
                 req.open("GET", "versions.json");
diff --git a/redirect.html b/redirect.html
new file mode 100644
index 00000000..cf602f58
--- /dev/null
+++ b/redirect.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<!-- <copyright>
+ This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
+ No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
+ (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
+ </copyright> -->
+<html>
+
+<head>
+
+    <title>Ninja - Browser support: Download Google Chrome</title>
+
+</head>
+
+<body>
+
+    <div>
+        <p>Your browser is not supported. Please download and install the latest version of <a href="https://www.google.com/chrome/">Google Chrome</a></p>
+    </div>
+
+</body>
+
+</html>
\ No newline at end of file
-- 
cgit v1.2.3


From 1d8af9fb2be85c33ce6a846f97360ba2ee17ea23 Mon Sep 17 00:00:00 2001
From: Nivesh Rajbhandari
Date: Tue, 31 Jan 2012 01:54:55 +0800
Subject: Checkbox and Combobox change/changing events were not setting
 wasSetByCode property correctly, causing our PI to dispatch events at
 improper times.

Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
---
 js/components/combobox.reel/combobox.js | 2 +-
 js/components/radio.reel/radio.js       | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/js/components/combobox.reel/combobox.js b/js/components/combobox.reel/combobox.js
index f262bb06..a68a7d6b 100644
--- a/js/components/combobox.reel/combobox.js
+++ b/js/components/combobox.reel/combobox.js
@@ -67,7 +67,7 @@ exports.Combobox = Montage.create(Component, {
                 var e = document.createEvent("CustomEvent");
                 e.initEvent("change", true, true);
                 e.type = "change";
-                e._wasSetByCode = this._wasSetByCode;
+                e.wasSetByCode = this._wasSetByCode;
                 e.value = this._value;
                 this.dispatchEvent(e);
 
diff --git a/js/components/radio.reel/radio.js b/js/components/radio.reel/radio.js
index 954da3c4..c661ec11 100644
--- a/js/components/radio.reel/radio.js
+++ b/js/components/radio.reel/radio.js
@@ -41,7 +41,7 @@ exports.RadioGroup = Montage.create(Component, {
                     e = document.createEvent("CustomEvent");
                     e.initEvent("change", true, true);
                     e.type = "change";
-                    e._wasSetByCode = this._wasSetByCode;
+                    e.wasSetByCode = this._wasSetByCode;
                     e.selectedIndex = i;
                     e.selectedItem = value;
                     this.dispatchEvent(e);
@@ -77,7 +77,7 @@ exports.RadioGroup = Montage.create(Component, {
     {
         value:function(event)
         {
-            this._wasSetByCode = event._event._wasSetByCode;
+            this._wasSetByCode = event._event.wasSetByCode;
             this.selectedItem = event._event.value;
         }
     }
@@ -126,7 +126,7 @@ exports.Radio = Montage.create(Component, {
             var e = document.createEvent("CustomEvent");
             e.initEvent("change", true, true);
             e.type = "change";
-            e._wasSetByCode = this._wasSetByCode;
+            e.wasSetByCode = this._wasSetByCode;
             e.value = this;
             this.dispatchEvent(e);
 
-- 
cgit v1.2.3


From b01b586a26ae47d329bdd5fe005051513711fab7 Mon Sep 17 00:00:00 2001
From: Valerio Virgillito
Date: Tue, 31 Jan 2012 15:11:04 -0800
Subject: Fixing the bread-crumb background

The CSS cleanup added a background to the bottom panel container which broke the bread-crumb background.
Fixing by adding the background directly to the bread-crumb component.

Signed-off-by: Valerio Virgillito <valerio@motorola.com>
---
 js/components/layout/bread-crumb.reel/bread-crumb.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/js/components/layout/bread-crumb.reel/bread-crumb.css b/js/components/layout/bread-crumb.reel/bread-crumb.css
index f84c6e80..cc984609 100644
--- a/js/components/layout/bread-crumb.reel/bread-crumb.css
+++ b/js/components/layout/bread-crumb.reel/bread-crumb.css
@@ -5,6 +5,7 @@
  </copyright> */
 
 .bread_crumb{
+    background-color: #282828;
     border-style: double;
     height: 26px;
 }
-- 
cgit v1.2.3


From ea8b9e2e62b85ecc75baf0b6ead5acafd70f0ab3 Mon Sep 17 00:00:00 2001
From: Jon Reid
Date: Tue, 31 Jan 2012 17:26:56 -0800
Subject: Added skin for html buttons.

---
 _scss/compass_app_log.txt     |  1 +
 _scss/imports/scss/_Base.scss | 18 ++++++++++++++++--
 css/ninja.css                 |  6 ++++--
 3 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/_scss/compass_app_log.txt b/_scss/compass_app_log.txt
index 00a7f071..463846ba 100644
--- a/_scss/compass_app_log.txt
+++ b/_scss/compass_app_log.txt
@@ -106,3 +106,4 @@
 2012-01-27 16:12:29 overwrite ../css/ninja.css
 2012-01-27 16:13:46 overwrite ../css/ninja.css
 2012-01-27 16:14:02 overwrite ../css/ninja.css
+2012-01-31 17:22:02 overwrite ../css/ninja.css
diff --git a/_scss/imports/scss/_Base.scss b/_scss/imports/scss/_Base.scss
index 75ccc07d..77faa8f3 100644
--- a/_scss/imports/scss/_Base.scss
+++ b/_scss/imports/scss/_Base.scss
@@ -48,8 +48,7 @@ input.nj-skinned,
 textarea.nj-skinned, 
 button.nj-skinned,
 select.nj-skinned,
-select.nj-skinned option,
-button.nj-skinned {
+select.nj-skinned option {
 	-webkit-appearance: none;
 	outline: none;
 }
@@ -122,6 +121,21 @@ input[type="search"].nj-skinned::-webkit-search-cancel-button:after {
 button.nj-skinned {
 	font-size: 9px;
     cursor: pointer;
+	display: block;
+	border: 0px;
+	margin: 0px;
+	padding: 4px;
+	border: 1px $color-input-border solid;
+	background-color: $color-menu-bg;
+	background-image: -webkit-linear-gradient(top, $color-radio-gradient-top 0%, $color-radio-gradient-bottom 100%);
+	border-radius: 4px;
+	color: $color-menu-text;
+	text-transform: uppercase;
+	cursor: pointer;
+	text-shadow: 1px 1px 1px $color-app-shadow
+}
+button.nj-skinned:hover {
+	background-image: -webkit-linear-gradient(top, $color-radio-gradient-bottom 0%, $color-radio-gradient-top 100%); 
 }
 
 // Radio buttons 
diff --git a/css/ninja.css b/css/ninja.css
index 9126c1d3..bf71955f 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,9 @@ 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, #646464 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:hover { background-image: -webkit-linear-gradient(top, #3c3c3c 0%, #646464 100%); }
 
 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); }
 
-- 
cgit v1.2.3


From 5233508614656c529d6c596f7e2f2c24adce9b69 Mon Sep 17 00:00:00 2001
From: Jose Antonio Marquez
Date: Mon, 30 Jan 2012 15:18:50 -0800
Subject: IKNINJA-1083

Fixing minor bug with no color breaking on null alpha value.
---
 js/panels/Color/colorchippopup.reel/colorchippopup.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/panels/Color/colorchippopup.reel/colorchippopup.js b/js/panels/Color/colorchippopup.reel/colorchippopup.js
index 03e14b28..05bcb447 100644
--- a/js/panels/Color/colorchippopup.reel/colorchippopup.js
+++ b/js/panels/Color/colorchippopup.reel/colorchippopup.js
@@ -109,7 +109,7 @@ exports.ColorChipPopup = Montage.create(Component, {
    			this.cc_hexinput.labelFunction = this._hexLabel.bind(this);
     		this.cc_hexinput.inputFunction = this._hexInput.bind(this);
    			//
-   			if (this.application.ninja.colorController.colorView.currentChip && this.application.ninja.colorController.colorView.currentChip.colorValue.a) {
+   			if (this.application.ninja.colorController.colorView.currentChip && this.application.ninja.colorController.colorView.currentChip.colorValue && this.application.ninja.colorController.colorView.currentChip.colorValue.a) {
    				this.combo.slider.value = Math.round(this.application.ninja.colorController.colorView.currentChip.colorValue.a*100);
    			} else {
    				this.combo.slider.value = 100;
-- 
cgit v1.2.3


From 406995bfdd472ea52e6e5998a76049214e40a3fd Mon Sep 17 00:00:00 2001
From: John Mayhew
Date: Mon, 30 Jan 2012 13:24:47 -0800
Subject: Removed unused images and reduced the size of the larger image files
 used for shaders.

---
 assets/images/BasePlatformA01_AO.png | Bin 65754 -> 0 bytes
 assets/images/BasePlatformA01_DM.png | Bin 70207 -> 0 bytes
 assets/images/BoxA01_AO.png          | Bin 62516 -> 0 bytes
 assets/images/BoxA01_DM.png          | Bin 54892 -> 0 bytes
 assets/images/Grunge.png             | Bin 2174259 -> 0 bytes
 assets/images/LabelFrame.tga         | Bin 12306 -> 0 bytes
 assets/images/MArmBaseN_DM.png       | Bin 136280 -> 0 bytes
 assets/images/MArmBaseN_NM.png       | Bin 109974 -> 0 bytes
 assets/images/MArmTopN_DM.png        | Bin 136902 -> 0 bytes
 assets/images/MArmTopN_NM.png        | Bin 97275 -> 0 bytes
 assets/images/MArm_AO.png            | Bin 157336 -> 0 bytes
 assets/images/MBaseWallA01_AO.png    | Bin 134056 -> 0 bytes
 assets/images/MBaseWallA01_DM.png    | Bin 136022 -> 0 bytes
 assets/images/MBaseWallA01_GM.png    | Bin 26051 -> 0 bytes
 assets/images/MBase_AO.png           | Bin 165449 -> 0 bytes
 assets/images/MCoreBase_DM.png       | Bin 130589 -> 0 bytes
 assets/images/MCoreBase_GM.png       | Bin 9853 -> 0 bytes
 assets/images/MEjectorBaseN_DM.png   | Bin 119768 -> 0 bytes
 assets/images/MEjectorBaseN_NM.png   | Bin 57808 -> 0 bytes
 assets/images/MRingBaseN_DM.png      | Bin 107671 -> 0 bytes
 assets/images/MRingBaseN_NM.png      | Bin 94852 -> 0 bytes
 assets/images/MSquareBaseN_DM.png    | Bin 76400 -> 0 bytes
 assets/images/MWall_AO.png           | Bin 108536 -> 0 bytes
 assets/images/MWall_DM.png           | Bin 133125 -> 0 bytes
 assets/images/MWall_GM.png           | Bin 9294 -> 0 bytes
 assets/images/MWall_NM.png           | Bin 89287 -> 0 bytes
 assets/images/Ref.png                | Bin 13632 -> 0 bytes
 assets/images/Spec.png               | Bin 2321526 -> 0 bytes
 assets/images/black.tga              | Bin 210 -> 0 bytes
 assets/images/cube.png               | Bin 34506 -> 0 bytes
 assets/images/cubelight_Glow.png     | Bin 3635 -> 0 bytes
 assets/images/cubelight_spec.png     | Bin 33249 -> 0 bytes
 assets/images/default_white.png      | Bin 90 -> 0 bytes
 assets/images/droid.png              | Bin 885 -> 0 bytes
 assets/images/env.png                | Bin 85724 -> 0 bytes
 assets/images/femaleRobot.png        | Bin 2857 -> 0 bytes
 assets/images/femaleRobot_Glow.png   | Bin 2855 -> 0 bytes
 assets/images/lightRack.png          | Bin 2857 -> 0 bytes
 assets/images/lightRack_Glow.png     | Bin 2857 -> 0 bytes
 assets/images/metal.png              | Bin 2366049 -> 696663 bytes
 assets/images/particle-star.png      | Bin 3665 -> 0 bytes
 assets/images/quilt01.png            | Bin 572888 -> 0 bytes
 assets/images/quilt01_E.png          | Bin 3273 -> 0 bytes
 assets/images/quilt01_N.png          | Bin 116034 -> 0 bytes
 assets/images/quilt02.png            | Bin 391471 -> 0 bytes
 assets/images/quilt02_E.png          | Bin 3273 -> 0 bytes
 assets/images/quilt02_N.png          | Bin 34939 -> 0 bytes
 assets/images/white.tga              | Bin 236 -> 0 bytes
 48 files changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 assets/images/BasePlatformA01_AO.png
 delete mode 100644 assets/images/BasePlatformA01_DM.png
 delete mode 100644 assets/images/BoxA01_AO.png
 delete mode 100644 assets/images/BoxA01_DM.png
 delete mode 100644 assets/images/Grunge.png
 delete mode 100644 assets/images/LabelFrame.tga
 delete mode 100644 assets/images/MArmBaseN_DM.png
 delete mode 100644 assets/images/MArmBaseN_NM.png
 delete mode 100644 assets/images/MArmTopN_DM.png
 delete mode 100644 assets/images/MArmTopN_NM.png
 delete mode 100644 assets/images/MArm_AO.png
 delete mode 100644 assets/images/MBaseWallA01_AO.png
 delete mode 100644 assets/images/MBaseWallA01_DM.png
 delete mode 100644 assets/images/MBaseWallA01_GM.png
 delete mode 100644 assets/images/MBase_AO.png
 delete mode 100644 assets/images/MCoreBase_DM.png
 delete mode 100644 assets/images/MCoreBase_GM.png
 delete mode 100644 assets/images/MEjectorBaseN_DM.png
 delete mode 100644 assets/images/MEjectorBaseN_NM.png
 delete mode 100644 assets/images/MRingBaseN_DM.png
 delete mode 100644 assets/images/MRingBaseN_NM.png
 delete mode 100644 assets/images/MSquareBaseN_DM.png
 delete mode 100644 assets/images/MWall_AO.png
 delete mode 100644 assets/images/MWall_DM.png
 delete mode 100644 assets/images/MWall_GM.png
 delete mode 100644 assets/images/MWall_NM.png
 delete mode 100644 assets/images/Ref.png
 delete mode 100644 assets/images/Spec.png
 delete mode 100644 assets/images/black.tga
 delete mode 100644 assets/images/cube.png
 delete mode 100644 assets/images/cubelight_Glow.png
 delete mode 100644 assets/images/cubelight_spec.png
 delete mode 100644 assets/images/default_white.png
 delete mode 100644 assets/images/droid.png
 delete mode 100644 assets/images/env.png
 delete mode 100644 assets/images/femaleRobot.png
 delete mode 100644 assets/images/femaleRobot_Glow.png
 delete mode 100644 assets/images/lightRack.png
 delete mode 100644 assets/images/lightRack_Glow.png
 delete mode 100644 assets/images/particle-star.png
 delete mode 100644 assets/images/quilt01.png
 delete mode 100644 assets/images/quilt01_E.png
 delete mode 100644 assets/images/quilt01_N.png
 delete mode 100644 assets/images/quilt02.png
 delete mode 100644 assets/images/quilt02_E.png
 delete mode 100644 assets/images/quilt02_N.png
 delete mode 100644 assets/images/white.tga

diff --git a/assets/images/BasePlatformA01_AO.png b/assets/images/BasePlatformA01_AO.png
deleted file mode 100644
index 11f74245..00000000
Binary files a/assets/images/BasePlatformA01_AO.png and /dev/null differ
diff --git a/assets/images/BasePlatformA01_DM.png b/assets/images/BasePlatformA01_DM.png
deleted file mode 100644
index f367ccb7..00000000
Binary files a/assets/images/BasePlatformA01_DM.png and /dev/null differ
diff --git a/assets/images/BoxA01_AO.png b/assets/images/BoxA01_AO.png
deleted file mode 100644
index 60a88883..00000000
Binary files a/assets/images/BoxA01_AO.png and /dev/null differ
diff --git a/assets/images/BoxA01_DM.png b/assets/images/BoxA01_DM.png
deleted file mode 100644
index cc6f6165..00000000
Binary files a/assets/images/BoxA01_DM.png and /dev/null differ
diff --git a/assets/images/Grunge.png b/assets/images/Grunge.png
deleted file mode 100644
index 49ff48e9..00000000
Binary files a/assets/images/Grunge.png and /dev/null differ
diff --git a/assets/images/LabelFrame.tga b/assets/images/LabelFrame.tga
deleted file mode 100644
index 7e3326bd..00000000
Binary files a/assets/images/LabelFrame.tga and /dev/null differ
diff --git a/assets/images/MArmBaseN_DM.png b/assets/images/MArmBaseN_DM.png
deleted file mode 100644
index 6845b555..00000000
Binary files a/assets/images/MArmBaseN_DM.png and /dev/null differ
diff --git a/assets/images/MArmBaseN_NM.png b/assets/images/MArmBaseN_NM.png
deleted file mode 100644
index 5009b0ec..00000000
Binary files a/assets/images/MArmBaseN_NM.png and /dev/null differ
diff --git a/assets/images/MArmTopN_DM.png b/assets/images/MArmTopN_DM.png
deleted file mode 100644
index ef3511b3..00000000
Binary files a/assets/images/MArmTopN_DM.png and /dev/null differ
diff --git a/assets/images/MArmTopN_NM.png b/assets/images/MArmTopN_NM.png
deleted file mode 100644
index 489c92db..00000000
Binary files a/assets/images/MArmTopN_NM.png and /dev/null differ
diff --git a/assets/images/MArm_AO.png b/assets/images/MArm_AO.png
deleted file mode 100644
index be27c8cb..00000000
Binary files a/assets/images/MArm_AO.png and /dev/null differ
diff --git a/assets/images/MBaseWallA01_AO.png b/assets/images/MBaseWallA01_AO.png
deleted file mode 100644
index d68e4209..00000000
Binary files a/assets/images/MBaseWallA01_AO.png and /dev/null differ
diff --git a/assets/images/MBaseWallA01_DM.png b/assets/images/MBaseWallA01_DM.png
deleted file mode 100644
index 02a31e16..00000000
Binary files a/assets/images/MBaseWallA01_DM.png and /dev/null differ
diff --git a/assets/images/MBaseWallA01_GM.png b/assets/images/MBaseWallA01_GM.png
deleted file mode 100644
index 726453ae..00000000
Binary files a/assets/images/MBaseWallA01_GM.png and /dev/null differ
diff --git a/assets/images/MBase_AO.png b/assets/images/MBase_AO.png
deleted file mode 100644
index 12d763da..00000000
Binary files a/assets/images/MBase_AO.png and /dev/null differ
diff --git a/assets/images/MCoreBase_DM.png b/assets/images/MCoreBase_DM.png
deleted file mode 100644
index 4d0ec6dd..00000000
Binary files a/assets/images/MCoreBase_DM.png and /dev/null differ
diff --git a/assets/images/MCoreBase_GM.png b/assets/images/MCoreBase_GM.png
deleted file mode 100644
index 81d464ec..00000000
Binary files a/assets/images/MCoreBase_GM.png and /dev/null differ
diff --git a/assets/images/MEjectorBaseN_DM.png b/assets/images/MEjectorBaseN_DM.png
deleted file mode 100644
index 1832c522..00000000
Binary files a/assets/images/MEjectorBaseN_DM.png and /dev/null differ
diff --git a/assets/images/MEjectorBaseN_NM.png b/assets/images/MEjectorBaseN_NM.png
deleted file mode 100644
index 4f7560d3..00000000
Binary files a/assets/images/MEjectorBaseN_NM.png and /dev/null differ
diff --git a/assets/images/MRingBaseN_DM.png b/assets/images/MRingBaseN_DM.png
deleted file mode 100644
index f8a4aebe..00000000
Binary files a/assets/images/MRingBaseN_DM.png and /dev/null differ
diff --git a/assets/images/MRingBaseN_NM.png b/assets/images/MRingBaseN_NM.png
deleted file mode 100644
index c9242acb..00000000
Binary files a/assets/images/MRingBaseN_NM.png and /dev/null differ
diff --git a/assets/images/MSquareBaseN_DM.png b/assets/images/MSquareBaseN_DM.png
deleted file mode 100644
index 5576eff0..00000000
Binary files a/assets/images/MSquareBaseN_DM.png and /dev/null differ
diff --git a/assets/images/MWall_AO.png b/assets/images/MWall_AO.png
deleted file mode 100644
index e5d5a684..00000000
Binary files a/assets/images/MWall_AO.png and /dev/null differ
diff --git a/assets/images/MWall_DM.png b/assets/images/MWall_DM.png
deleted file mode 100644
index b735de01..00000000
Binary files a/assets/images/MWall_DM.png and /dev/null differ
diff --git a/assets/images/MWall_GM.png b/assets/images/MWall_GM.png
deleted file mode 100644
index 2cd56c3d..00000000
Binary files a/assets/images/MWall_GM.png and /dev/null differ
diff --git a/assets/images/MWall_NM.png b/assets/images/MWall_NM.png
deleted file mode 100644
index 2650bc07..00000000
Binary files a/assets/images/MWall_NM.png and /dev/null differ
diff --git a/assets/images/Ref.png b/assets/images/Ref.png
deleted file mode 100644
index 226e4200..00000000
Binary files a/assets/images/Ref.png and /dev/null differ
diff --git a/assets/images/Spec.png b/assets/images/Spec.png
deleted file mode 100644
index 76658540..00000000
Binary files a/assets/images/Spec.png and /dev/null differ
diff --git a/assets/images/black.tga b/assets/images/black.tga
deleted file mode 100644
index 69124ff0..00000000
Binary files a/assets/images/black.tga and /dev/null differ
diff --git a/assets/images/cube.png b/assets/images/cube.png
deleted file mode 100644
index 6cb3ef82..00000000
Binary files a/assets/images/cube.png and /dev/null differ
diff --git a/assets/images/cubelight_Glow.png b/assets/images/cubelight_Glow.png
deleted file mode 100644
index 4f8c922f..00000000
Binary files a/assets/images/cubelight_Glow.png and /dev/null differ
diff --git a/assets/images/cubelight_spec.png b/assets/images/cubelight_spec.png
deleted file mode 100644
index 5cfe820b..00000000
Binary files a/assets/images/cubelight_spec.png and /dev/null differ
diff --git a/assets/images/default_white.png b/assets/images/default_white.png
deleted file mode 100644
index cca49ba7..00000000
Binary files a/assets/images/default_white.png and /dev/null differ
diff --git a/assets/images/droid.png b/assets/images/droid.png
deleted file mode 100644
index 9cba133e..00000000
Binary files a/assets/images/droid.png and /dev/null differ
diff --git a/assets/images/env.png b/assets/images/env.png
deleted file mode 100644
index 72bba813..00000000
Binary files a/assets/images/env.png and /dev/null differ
diff --git a/assets/images/femaleRobot.png b/assets/images/femaleRobot.png
deleted file mode 100644
index 30b153b4..00000000
Binary files a/assets/images/femaleRobot.png and /dev/null differ
diff --git a/assets/images/femaleRobot_Glow.png b/assets/images/femaleRobot_Glow.png
deleted file mode 100644
index 1141f521..00000000
Binary files a/assets/images/femaleRobot_Glow.png and /dev/null differ
diff --git a/assets/images/lightRack.png b/assets/images/lightRack.png
deleted file mode 100644
index 30b153b4..00000000
Binary files a/assets/images/lightRack.png and /dev/null differ
diff --git a/assets/images/lightRack_Glow.png b/assets/images/lightRack_Glow.png
deleted file mode 100644
index 30b153b4..00000000
Binary files a/assets/images/lightRack_Glow.png and /dev/null differ
diff --git a/assets/images/metal.png b/assets/images/metal.png
index d753bec4..ab36aaac 100644
Binary files a/assets/images/metal.png and b/assets/images/metal.png differ
diff --git a/assets/images/particle-star.png b/assets/images/particle-star.png
deleted file mode 100644
index 7da25295..00000000
Binary files a/assets/images/particle-star.png and /dev/null differ
diff --git a/assets/images/quilt01.png b/assets/images/quilt01.png
deleted file mode 100644
index 9c14865f..00000000
Binary files a/assets/images/quilt01.png and /dev/null differ
diff --git a/assets/images/quilt01_E.png b/assets/images/quilt01_E.png
deleted file mode 100644
index 2dbafd27..00000000
Binary files a/assets/images/quilt01_E.png and /dev/null differ
diff --git a/assets/images/quilt01_N.png b/assets/images/quilt01_N.png
deleted file mode 100644
index 801cd09d..00000000
Binary files a/assets/images/quilt01_N.png and /dev/null differ
diff --git a/assets/images/quilt02.png b/assets/images/quilt02.png
deleted file mode 100644
index 4b1bf2ed..00000000
Binary files a/assets/images/quilt02.png and /dev/null differ
diff --git a/assets/images/quilt02_E.png b/assets/images/quilt02_E.png
deleted file mode 100644
index 2dbafd27..00000000
Binary files a/assets/images/quilt02_E.png and /dev/null differ
diff --git a/assets/images/quilt02_N.png b/assets/images/quilt02_N.png
deleted file mode 100644
index 136d1008..00000000
Binary files a/assets/images/quilt02_N.png and /dev/null differ
diff --git a/assets/images/white.tga b/assets/images/white.tga
deleted file mode 100644
index a40a0a2b..00000000
Binary files a/assets/images/white.tga and /dev/null differ
-- 
cgit v1.2.3


From 73b50a4b79bb55170ef585919709bc5ad6244697 Mon Sep 17 00:00:00 2001
From: Valerio Virgillito
Date: Mon, 30 Jan 2012 23:08:42 -0800
Subject: Adding browser check for Chrome and redirect page.

Adding a check for Google Chrome browser and a redirect page to download and install Chrome.

Signed-off-by: Valerio Virgillito <valerio@motorola.com>
---
 index.html    |  4 ++++
 redirect.html | 23 +++++++++++++++++++++++
 2 files changed, 27 insertions(+)
 create mode 100644 redirect.html

diff --git a/index.html b/index.html
index 5fa4790c..f3018823 100644
--- a/index.html
+++ b/index.html
@@ -168,6 +168,10 @@
 		
 		<script type="text/javascript">
 			window.onload = function() {
+                // Check if we are running in Chrome
+                if(navigator.userAgent.toLowerCase().indexOf("chrome") === -1) {
+                    window.location = "./redirect.html";
+                }
                 // Load the version json
                 var req = new XMLHttpRequest();
                 req.open("GET", "versions.json");
diff --git a/redirect.html b/redirect.html
new file mode 100644
index 00000000..cf602f58
--- /dev/null
+++ b/redirect.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<!-- <copyright>
+ This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
+ No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
+ (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
+ </copyright> -->
+<html>
+
+<head>
+
+    <title>Ninja - Browser support: Download Google Chrome</title>
+
+</head>
+
+<body>
+
+    <div>
+        <p>Your browser is not supported. Please download and install the latest version of <a href="https://www.google.com/chrome/">Google Chrome</a></p>
+    </div>
+
+</body>
+
+</html>
\ No newline at end of file
-- 
cgit v1.2.3


From f3678107282813836ee3d9271e484546bdd5a4b7 Mon Sep 17 00:00:00 2001
From: Nivesh Rajbhandari
Date: Tue, 31 Jan 2012 01:54:55 +0800
Subject: Checkbox and Combobox change/changing events were not setting
 wasSetByCode property correctly, causing our PI to dispatch events at
 improper times.

Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
---
 js/components/combobox.reel/combobox.js | 2 +-
 js/components/radio.reel/radio.js       | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/js/components/combobox.reel/combobox.js b/js/components/combobox.reel/combobox.js
index f262bb06..a68a7d6b 100644
--- a/js/components/combobox.reel/combobox.js
+++ b/js/components/combobox.reel/combobox.js
@@ -67,7 +67,7 @@ exports.Combobox = Montage.create(Component, {
                 var e = document.createEvent("CustomEvent");
                 e.initEvent("change", true, true);
                 e.type = "change";
-                e._wasSetByCode = this._wasSetByCode;
+                e.wasSetByCode = this._wasSetByCode;
                 e.value = this._value;
                 this.dispatchEvent(e);
 
diff --git a/js/components/radio.reel/radio.js b/js/components/radio.reel/radio.js
index 954da3c4..c661ec11 100644
--- a/js/components/radio.reel/radio.js
+++ b/js/components/radio.reel/radio.js
@@ -41,7 +41,7 @@ exports.RadioGroup = Montage.create(Component, {
                     e = document.createEvent("CustomEvent");
                     e.initEvent("change", true, true);
                     e.type = "change";
-                    e._wasSetByCode = this._wasSetByCode;
+                    e.wasSetByCode = this._wasSetByCode;
                     e.selectedIndex = i;
                     e.selectedItem = value;
                     this.dispatchEvent(e);
@@ -77,7 +77,7 @@ exports.RadioGroup = Montage.create(Component, {
     {
         value:function(event)
         {
-            this._wasSetByCode = event._event._wasSetByCode;
+            this._wasSetByCode = event._event.wasSetByCode;
             this.selectedItem = event._event.value;
         }
     }
@@ -126,7 +126,7 @@ exports.Radio = Montage.create(Component, {
             var e = document.createEvent("CustomEvent");
             e.initEvent("change", true, true);
             e.type = "change";
-            e._wasSetByCode = this._wasSetByCode;
+            e.wasSetByCode = this._wasSetByCode;
             e.value = this;
             this.dispatchEvent(e);
 
-- 
cgit v1.2.3


From a08d3d340085df5e67f564cba84dbb2253df2b2a Mon Sep 17 00:00:00 2001
From: Valerio Virgillito
Date: Tue, 31 Jan 2012 15:11:04 -0800
Subject: Fixing the bread-crumb background

The CSS cleanup added a background to the bottom panel container which broke the bread-crumb background.
Fixing by adding the background directly to the bread-crumb component.

Signed-off-by: Valerio Virgillito <valerio@motorola.com>
---
 js/components/layout/bread-crumb.reel/bread-crumb.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/js/components/layout/bread-crumb.reel/bread-crumb.css b/js/components/layout/bread-crumb.reel/bread-crumb.css
index f84c6e80..cc984609 100644
--- a/js/components/layout/bread-crumb.reel/bread-crumb.css
+++ b/js/components/layout/bread-crumb.reel/bread-crumb.css
@@ -5,6 +5,7 @@
  </copyright> */
 
 .bread_crumb{
+    background-color: #282828;
     border-style: double;
     height: 26px;
 }
-- 
cgit v1.2.3


From f02a5e1f92370944fc419602f5d360803e7013a8 Mon Sep 17 00:00:00 2001
From: Jon Reid
Date: Tue, 31 Jan 2012 17:26:56 -0800
Subject: Added skin for html buttons.

---
 _scss/compass_app_log.txt     |  1 +
 _scss/imports/scss/_Base.scss | 18 ++++++++++++++++--
 css/ninja.css                 |  6 ++++--
 3 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/_scss/compass_app_log.txt b/_scss/compass_app_log.txt
index 00a7f071..463846ba 100644
--- a/_scss/compass_app_log.txt
+++ b/_scss/compass_app_log.txt
@@ -106,3 +106,4 @@
 2012-01-27 16:12:29 overwrite ../css/ninja.css
 2012-01-27 16:13:46 overwrite ../css/ninja.css
 2012-01-27 16:14:02 overwrite ../css/ninja.css
+2012-01-31 17:22:02 overwrite ../css/ninja.css
diff --git a/_scss/imports/scss/_Base.scss b/_scss/imports/scss/_Base.scss
index 75ccc07d..77faa8f3 100644
--- a/_scss/imports/scss/_Base.scss
+++ b/_scss/imports/scss/_Base.scss
@@ -48,8 +48,7 @@ input.nj-skinned,
 textarea.nj-skinned, 
 button.nj-skinned,
 select.nj-skinned,
-select.nj-skinned option,
-button.nj-skinned {
+select.nj-skinned option {
 	-webkit-appearance: none;
 	outline: none;
 }
@@ -122,6 +121,21 @@ input[type="search"].nj-skinned::-webkit-search-cancel-button:after {
 button.nj-skinned {
 	font-size: 9px;
     cursor: pointer;
+	display: block;
+	border: 0px;
+	margin: 0px;
+	padding: 4px;
+	border: 1px $color-input-border solid;
+	background-color: $color-menu-bg;
+	background-image: -webkit-linear-gradient(top, $color-radio-gradient-top 0%, $color-radio-gradient-bottom 100%);
+	border-radius: 4px;
+	color: $color-menu-text;
+	text-transform: uppercase;
+	cursor: pointer;
+	text-shadow: 1px 1px 1px $color-app-shadow
+}
+button.nj-skinned:hover {
+	background-image: -webkit-linear-gradient(top, $color-radio-gradient-bottom 0%, $color-radio-gradient-top 100%); 
 }
 
 // Radio buttons 
diff --git a/css/ninja.css b/css/ninja.css
index 9126c1d3..bf71955f 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-s