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>

3 files changed, 24 insertions, 24 deletions

diff --git a/node_modules/montage/ui/bluemoon/progress.reel/progress.css b/node_modules/montage/ui/bluemoon/progress.reel/progress.css
index 54da4477..6c4f730d 100644
--- a/node_modules/montage/ui/bluemoon/progress.reel/progress.css
+++ b/node_modules/montage/ui/bluemoon/progress.reel/progress.css
@@ -28,31 +28,31 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 </copyright> */
 .montage-progress {
-        height: 7px;
-        padding: 1px;
-        border-radius: 5px / 4px;
-        overflow: hidden;
-        background: #ccc url(rule.png);
-        -webkit-box-shadow: inset rgba(0,0,0,.2) 0 0 0 1px, rgba(255,255,255,.5) 0 1px 1px, rgba(0,0,0,.1) 0 -1px 0px;
-        -moz-box-shadow: inset rgba(0,0,0,.2) 0 0 0 1px, rgba(255,255,255,.5) 0 1px 1px, rgba(0,0,0,.1) 0 -1px 0px;
-        box-shadow: inset rgba(0,0,0,.2) 0 0 0 1px, rgba(255,255,255,.5) 0 1px 1px, rgba(0,0,0,.1) 0 -1px 0px;
+    height: 7px;
+    padding: 1px;
+    border-radius: 5px / 4px;
+    overflow: hidden;
+    background: #ccc url(rule.png);
+    -webkit-box-shadow: inset rgba(0,0,0,.2) 0 0 0 1px, rgba(255,255,255,.5) 0 1px 1px, rgba(0,0,0,.1) 0 -1px 0px;
+    -moz-box-shadow: inset rgba(0,0,0,.2) 0 0 0 1px, rgba(255,255,255,.5) 0 1px 1px, rgba(0,0,0,.1) 0 -1px 0px;
+    box-shadow: inset rgba(0,0,0,.2) 0 0 0 1px, rgba(255,255,255,.5) 0 1px 1px, rgba(0,0,0,.1) 0 -1px 0px;
 }
 
 .montage-progress .bar {
-        height: 7px;
-        border-radius: inherit;
-        background: #0cbeff;
+    height: 7px;
+    border-radius: inherit;
+    background: #0cbeff;
 
-        -webkit-transition: width .3s cubic-bezier(0.25, 0.1, 0.3, 0.9);
-        -moz-transition: width .3s cubic-bezier(0.25, 0.1, 0.3, 0.9);
-        transition: width .3s cubic-bezier(0.25, 0.1, 0.3, 0.9);
+    -webkit-transition: width .3s cubic-bezier(0.25, 0.1, 0.3, 0.9);
+    -moz-transition: width .3s cubic-bezier(0.25, 0.1, 0.3, 0.9);
+    transition: width .3s cubic-bezier(0.25, 0.1, 0.3, 0.9);
 }
 
 .montage-progress.dark {
-        background:  url(rule.png), -webkit-gradient(linear, 0% 0%, 0% 100%,
-                                                color-stop(0%, #303030), color-stop(100%, #3f3f3f) );
+    background:  url(rule.png), -webkit-gradient(linear, 0% 0%, 0% 100%,
+                        color-stop(0%, #303030), color-stop(100%, #3f3f3f) );
 
-        -webkit-box-shadow: rgba(255,255,255,.1) 0 1px 0, rgba(0,0,0,.1) 0 -1px 0px;
-        -moz-box-shadow: rgba(255,255,255,.1) 0 1px 0, rgba(0,0,0,.1) 0 -1px 0px;
-        box-shadow: rgba(255,255,255,.1) 0 1px 0, rgba(0,0,0,.1) 0 -1px 0px;
+    -webkit-box-shadow: rgba(255,255,255,.1) 0 1px 0, rgba(0,0,0,.1) 0 -1px 0px;
+    -moz-box-shadow: rgba(255,255,255,.1) 0 1px 0, rgba(0,0,0,.1) 0 -1px 0px;
+    box-shadow: rgba(255,255,255,.1) 0 1px 0, rgba(0,0,0,.1) 0 -1px 0px;
 }
diff --git a/node_modules/montage/ui/bluemoon/progress.reel/progress.html b/node_modules/montage/ui/bluemoon/progress.reel/progress.html
index 774da851..78f128c0 100644
--- a/node_modules/montage/ui/bluemoon/progress.reel/progress.html
+++ b/node_modules/montage/ui/bluemoon/progress.reel/progress.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <!-- <copyright>
 Copyright (c) 2012, Motorola Mobility, Inc
 All Rights Reserved.
@@ -44,8 +44,8 @@ POSSIBILITY OF SUCH DAMAGE.
     </script>
 </head>
 <body>
-        <div data-montage-id="progress" class="montage-progress">
-                <div data-montage-id="bar" class="bar"></div>
-        </div>
+    <div data-montage-id="progress" class="montage-progress">
+        <div data-montage-id="bar" class="bar"></div>
+    </div>
 </body>
 </html>
diff --git a/node_modules/montage/ui/bluemoon/progress.reel/progress.js b/node_modules/montage/ui/bluemoon/progress.reel/progress.js
index 01d0df9b..b6a6f91f 100644
--- a/node_modules/montage/ui/bluemoon/progress.reel/progress.js
+++ b/node_modules/montage/ui/bluemoon/progress.reel/progress.js
@@ -28,7 +28,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 </copyright> */
 /**
-        @module "montage/ui/bluemoon/progress.reel"
+    @module "montage/ui/bluemoon/progress.reel"
     @requires montage/core/core
     @requires montage/ui/component
 */