Merge branch 'refs/heads/NinjaInternal' into Color

Conflicts:
	js/controllers/elements/shapes-controller.js
	js/data/pi/pi-data.js
	js/panels/properties/content.reel/content.js

1 files changed, 5 insertions, 2 deletions

diff --git a/_scss/imports/scss/_Base.scss b/_scss/imports/scss/_Base.scss
index 77faa8f3..8a743174 100644
--- 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