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, 27 insertions, 27 deletions

diff --git a/js/components/popup.reel/css/popup.scss b/js/components/popup.reel/css/popup.scss
index 75ff2814..fc959b84 100755
--- a/js/components/popup.reel/css/popup.scss
+++ b/js/components/popup.reel/css/popup.scss
@@ -34,43 +34,43 @@ $grey_light: #494949;
 
 .default_popup
 {
-        //MUST HAVE TO ALLOW FOR SIZE AJUSTMENTS
-        position: absolute;
-        width: auto;
-        float: left;
-        
-        //TEXT STYLES
-        font-family: 'Droid Sans', sans-serif;
-        color: #FFF;
-        
-        //BACKGROUND AND CONTAINER
-        background: $grey_light;
-        border: 1px solid $grey_dark;
-        border-radius: 8px;
-        padding: 8px;
-        box-shadow: 0px 0px 8px rgba(0, 0, 0, .8);
-        pointerEvents: auto;
+    //MUST HAVE TO ALLOW FOR SIZE AJUSTMENTS
+    position: absolute;
+    width: auto;
+    float: left;
+
+    //TEXT STYLES
+    font-family: 'Droid Sans', sans-serif;
+    color: #FFF;
+
+    //BACKGROUND AND CONTAINER
+    background: $grey_light;
+    border: 1px solid $grey_dark;
+    border-radius: 8px;
+    padding: 8px;
+    box-shadow: 0px 0px 8px rgba(0, 0, 0, .8);
+    pointerEvents: auto;
 }
 
 .default_popup .content
 {
-        overflow: auto;
-        float: left;
+    overflow: auto;
+    float: left;
 }
 
 .default_popup .tooltip
 {
-        position: absolute;
-        overflow: hidden;
+    position: absolute;
+    overflow: hidden;
 }
 
 .default_popup .tooltip span
 {
-        -webkit-transform:rotate(45deg);
-        width: 12px;
-        height: 12px;
-        margin: 3px;
-        display: block;
-        background: $grey_light;
-        border: 1px solid $grey_dark;
+    -webkit-transform:rotate(45deg);
+    width: 12px;
+    height: 12px;
+    margin: 3px;
+    display: block;
+    background: $grey_light;
+    border: 1px solid $grey_dark;
 }