Merge branch 'normalize' of https://github.com/kriskowal/ninja-internal

Conflicts:
	js/components/gradientpicker.reel/gradientpicker.js
	js/components/tools-properties/text-properties.reel/text-properties.js
	js/document/views/base.js
	js/document/views/design.js
	js/helper-classes/3D/StageLine.js
	js/helper-classes/3D/draw-utils.js
	js/lib/drawing/world.js
	js/lib/geom/circle.js
	js/lib/geom/line.js
	js/lib/geom/rectangle.js
	js/lib/geom/shape-primitive.js
	js/lib/rdge/materials/bump-metal-material.js
	js/lib/rdge/materials/flag-material.js
	js/lib/rdge/materials/fly-material.js
	js/lib/rdge/materials/julia-material.js
	js/lib/rdge/materials/keleidoscope-material.js
	js/lib/rdge/materials/mandel-material.js
	js/lib/rdge/materials/material.js
	js/lib/rdge/materials/plasma-material.js
	js/lib/rdge/materials/pulse-material.js
	js/lib/rdge/materials/radial-gradient-material.js
	js/lib/rdge/materials/taper-material.js
	js/lib/rdge/materials/twist-vert-material.js
	js/lib/rdge/materials/water-material.js
	js/panels/Materials/materials-library-panel.reel/materials-library-panel.html
	js/panels/Materials/materials-library-panel.reel/materials-library-panel.js
	js/panels/Materials/materials-popup.reel/materials-popup.html
	js/panels/Materials/materials-popup.reel/materials-popup.js
	js/tools/LineTool.js

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

1 files changed, 23 insertions, 23 deletions

diff --git a/scss/imports/themes/default/_colors.scss b/scss/imports/themes/default/_colors.scss
index d22cb29a..8e67cfd7 100755
--- a/scss/imports/themes/default/_colors.scss
+++ b/scss/imports/themes/default/_colors.scss
@@ -34,7 +34,7 @@ POSSIBILITY OF SUCH DAMAGE.
 //Note: Some colors are defined as both rgb and rgba; some of the rgba versions have multiple a values.
 
 
-//  Colors for radio buttons and other form elements  
+//  Colors for radio buttons and other form elements
 $color-radio-border: rgb(40,40,40);
 $color-radio-shadow: rgba(200,200,200,0.5);
 $color-radio-gradient-top: rgb(100,100,100);
@@ -49,27 +49,27 @@ $color-input-border: rgb(49, 49, 49);
 $color-focus-outline: rgb(180, 180, 180);
 $color-transparent: rgba(0,0,0,0);
 
-//  Base colors for dividers 
-// Dividers consist of a div with a background color and either 
+//  Base colors for dividers
+// Dividers consist of a div with a background color and either
 // a top & bottom border (in the case of horizontal dividers)
 // or a left & right border (in the case of vertical dividers),
 // for a total of three different colors.
-// 
-  
-$color-divider-first: rgb(35,35,35); //  top and left  
-$color-divider-second: rgb(0,0,0); //  Middle  
-$color-divider-third: rgb(58,58,58); //  Bottom and right  
+//
 
-//  Main background color of entire app  
-$color-app-bg: rgb(0,0,0); //  Main app background color.  
-$color-app-bg-a1: rgba(0,0,0,1);  //  rgba version  
-$color-app-border: rgb(51,51,51); //  Main app border color  
-$color-app-shadow: rgba(0,0,0,.5); //  color of drop shadows  
-$color-stage: rgb(128,128,128); //  Stage color  
-$color-body-border: rgb(0,0,0); //  body border color  
-$color-body-bg: rgb(255,255,255); //  Body background color  
+$color-divider-first: rgb(35,35,35); //  top and left
+$color-divider-second: rgb(0,0,0); //  Middle
+$color-divider-third: rgb(58,58,58); //  Bottom and right
 
-//  Colors for main dropdown menus: background & text for both regular and highlighted states, dividers  
+//  Main background color of entire app
+$color-app-bg: rgb(0,0,0); //  Main app background color.
+$color-app-bg-a1: rgba(0,0,0,1);  //  rgba version
+$color-app-border: rgb(51,51,51); //  Main app border color
+$color-app-shadow: rgba(0,0,0,.5); //  color of drop shadows
+$color-stage: rgb(128,128,128); //  Stage color
+$color-body-border: rgb(0,0,0); //  body border color
+$color-body-bg: rgb(255,255,255); //  Body background color
+
+//  Colors for main dropdown menus: background & text for both regular and highlighted states, dividers
 $color-menu-bg: rgb(71,71,71);
 $color-menu-text: rgb(255,255,255);
 $color-menu-hilite-bg: rgb(178,178,178);
@@ -79,7 +79,7 @@ $color-menu-border: rgb(0,0,0);
 $color-menu-active-bg: rgb(181,122,10);
 
 
-//  Colors for tools: background, text, how they interact with the UI  
+//  Colors for tools: background, text, how they interact with the UI
 $color-tool-bg: rgb(41,41,41);
 $color-tool-bg-active: rgb(178,178,178);
 $color-tool-border-selected: rgb(89,89,89);
@@ -94,15 +94,15 @@ $color-tool-select-border: rgb(0,0,0);
 $color-tool-select-hover-bg: rgb(221,221,221);
 
 
-//  Colors for panels: background & text, both regular and highlighted states, dividers, borders, shadows, etc.  
+//  Colors for panels: background & text, both regular and highlighted states, dividers, borders, shadows, etc.
 $color-panel-bg: $color-menu-bg;
 $color-panel-text: $color-menu-text;
 $color-panel-input: $color-panel-text;
 $color-panel-hilite-bg: $color-menu-hilite-bg;
 $color-panel-hilite-text: $color-menu-hilite-text;
-$color-panel-clickable: rgb(215,215,215); //  used for editable items in their non-edit state, etc.  
-$color-panel-border: $color-menu-border; //  Border for panel and for block elements  
-$color-panel-shadow: rgb(58,58,58); //  Shadow for text and block elements  
+$color-panel-clickable: rgb(215,215,215); //  used for editable items in their non-edit state, etc.
+$color-panel-border: $color-menu-border; //  Border for panel and for block elements
+$color-panel-shadow: rgb(58,58,58); //  Shadow for text and block elements
 $color-panel-input-bg: rgb(68, 68, 68);
 $color-panel-dividerlabel-bg: rgb(62, 62, 62);
 $color-panel-input-border: rgb(49, 49, 49);
@@ -110,7 +110,7 @@ $color-panel-divider-top: rgb(62, 62, 62);
 $color-panel-divider: $color-menu-divider;
 $color-panel-divider-bottom: rgb(86, 86, 86);
 
-//  Colors for scroll bars  
+//  Colors for scroll bars
 $color-sb-border: rgb(0,0,0);
 $color-sb-1: rgb(140,140,140);
 $color-sb-2: rgb(173,173,173);