Merge branch 'refs/heads/NinjaInternal' into FileIO

Conflicts:
	.gitignore
	js/ninja.reel/ninja.js

2 files changed, 6 insertions, 3 deletions

diff --git a/_scss/imports/scss/_Base.scss b/_scss/imports/scss/_Base.scss
index 77faa8f3..8a743174 100755
--- a/_scss/imports/scss/_Base.scss
+++ b/_scss/imports/scss/_Base.scss
@@ -127,15 +127,18 @@ button.nj-skinned {
         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%);
+        background-image: -webkit-linear-gradient(top, $color-formgrad-top 0%, $color-formgrad-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:active {
+        background-image: -webkit-linear-gradient(top, $color-formgrad-bottom 0%, $color-formgrad-top 100%); 
+}
 button.nj-skinned:hover {
-        background-image: -webkit-linear-gradient(top, $color-radio-gradient-bottom 0%, $color-radio-gradient-top 100%); 
+        -webkit-box-shadow: 0px 0px 3px $color-focus-outline;
 }
 
 // Radio buttons 
diff --git a/_scss/imports/scss/_PanelUI.scss b/_scss/imports/scss/_PanelUI.scss
index ac82adf8..21ada556 100755
--- a/_scss/imports/scss/_PanelUI.scss
+++ b/_scss/imports/scss/_PanelUI.scss
@@ -390,7 +390,7 @@ ul.treeComponent > img:first-child
 // 
 #pp-container-assets .pp-scroll-linked,
 #pp-container-list .pp-scroll-linked {
-        width: 420px;
+        //width: 420px;
 }