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

diff --git a/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.css b/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.css
index 10dd277d..8a3064c1 100755
--- a/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.css
+++ b/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.css
@@ -38,7 +38,7 @@ POSSIBILITY OF SUCH DAMAGE.
     color:#ffffff;
     font-family: 'Droid Sans', sans-serif;
     border-radius: 8px;
-        box-shadow: 0px 0px 8px rgba(0, 0, 0, .8);
+    box-shadow: 0px 0px 8px rgba(0, 0, 0, .8);
 }
 
 .newfile .title{
@@ -47,8 +47,8 @@ POSSIBILITY OF SUCH DAMAGE.
     padding:5px;
     text-align: center;
     text-transform: uppercase;
-        font-weight: normal;
-        text-shadow: 1px 1px 1px #000;
+    font-weight: normal;
+    text-shadow: 1px 1px 1px #000;
 }
 
 .newfile .container{
@@ -84,7 +84,7 @@ POSSIBILITY OF SUCH DAMAGE.
 
 .newfile .right-bottom{
     border: 1px solid #000000;
-        border-left: none;
+    border-left: none;
     overflow: auto;
     height:42%;
     padding: 15px;
@@ -95,8 +95,8 @@ POSSIBILITY OF SUCH DAMAGE.
     padding:5px;
     text-align: center;
     text-transform: uppercase;
-        font-weight: normal;
-        text-shadow: 1px 1px 1px #000;
+    font-weight: normal;
+    text-shadow: 1px 1px 1px #000;
 }
 
 .newfile .buttons{
@@ -130,7 +130,7 @@ POSSIBILITY OF SUCH DAMAGE.
 }
 
 .newfile .atreeItem {
-        text-shadow: 1px 1px 1px #000;
+    text-shadow: 1px 1px 1px #000;
 }
 
 .newfile .atreeItem .name{
@@ -163,13 +163,13 @@ POSSIBILITY OF SUCH DAMAGE.
 }
 
 .newfile .buttons button {
-        float: left;
-        width: 100px;
-        margin-top: 3px;
+    float: left;
+    width: 100px;
+    margin-top: 3px;
 }
 
 .newfile .okButton{
-        margin: 0px 18px 0px 8px; 
+    margin: 0px 18px 0px 8px;
     /*
 margin-right:25px;
     -webkit-box-align: center;