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

diff --git a/js/io/ui/file-picker/picker-navigator.reel/picker-navigator.css b/js/io/ui/file-picker/picker-navigator.reel/picker-navigator.css
index e4ecf167..7c6e5d3a 100644
--- a/js/io/ui/file-picker/picker-navigator.reel/picker-navigator.css
+++ b/js/io/ui/file-picker/picker-navigator.reel/picker-navigator.css
@@ -39,8 +39,8 @@ POSSIBILITY OF SUCH DAMAGE.
     background-color:#494949;
     font-family: 'Droid Sans', sans-serif;
     border-radius: 8px;
-        box-shadow: 0px 0px 8px rgba(0, 0, 0, .8);
-        text-shadow: 1px 1px 1px #000;
+    box-shadow: 0px 0px 8px rgba(0, 0, 0, .8);
+    text-shadow: 1px 1px 1px #000;
 }
 
 .picker .pickerHeader{
@@ -229,13 +229,13 @@ POSSIBILITY OF SUCH DAMAGE.
 }
 
 .picker .buttons button {
-        float: left;
-        width: 100px;
-        margin-top: 3px;
+    float: left;
+    width: 100px;
+    margin-top: 3px;
 }
 
 .picker .okButton{
-        margin: 0px 22px 0px 8px; 
+    margin: 0px 22px 0px 8px;
     /*
 margin-right:25px;
     -webkit-box-align: center;