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, 2 insertions, 0 deletions

diff --git a/_scss/imports/themes/default/_colors.scss b/_scss/imports/themes/default/_colors.scss
index 34d5ffc9..2a7b8191 100644
--- a/_scss/imports/themes/default/_colors.scss
+++ b/_scss/imports/themes/default/_colors.scss
@@ -15,6 +15,8 @@ $color-radio-border: rgb(40,40,40);
 $color-radio-shadow: rgba(200,200,200,0.5);
 $color-radio-gradient-top: rgb(100,100,100);
 $color-radio-gradient-bottom: rgb(60,60,60);
+$color-formgrad-top: rgb(80,80,80);
+$color-formgrad-bottom: rgb(60,60,60);
 $color-radio-bg: rgb(0,0,0);
 $color-radio: rgb(200,200,200);
 $color-input: rgb(255,255,255);