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

diff --git a/node_modules/montage/ui/video-player.reel/video-player.css b/node_modules/montage/ui/video-player.reel/video-player.css
index dd082439..135f0099 100755
--- a/node_modules/montage/ui/video-player.reel/video-player.css
+++ b/node_modules/montage/ui/video-player.reel/video-player.css
@@ -44,9 +44,9 @@ MARK:    media
     position: absolute;
     display: -webkit-box;
     -webkit-box-sizing: border-box;
-    z-index: 1000;                                              /* TODO: Define global z-index regions */
+    z-index: 1000;                      /* TODO: Define global z-index regions */
     top: 0;
-        left: 0;
+    left: 0;
     border: none;
     width: 100%;
     height: 100%;
@@ -66,15 +66,15 @@ MARK:    Controller
 .montage-video-player .control-wrapper {
     position: absolute;
     left: 0;
-        bottom: 0;
-        right: 0;
-        height: 50px;
-        box-shadow: inset 0 2px 6px 2px hsla(0,0%,0%,.4);
-        background-color: hsla(0,0%,0%,.95);
-        background-image: -webkit-linear-gradient(top,  hsla(0,0%,100%,.27)  0%,
-                                                                                                        hsla(0,0%,100%,.15) 50%,
-                                                                                                        hsla(0,0%,30%,.4) 50%,
-                                                                                                        hsla(0,0%,0%,1) 100%);
+    bottom: 0;
+    right: 0;
+    height: 50px;
+    box-shadow: inset 0 2px 6px 2px hsla(0,0%,0%,.4);
+    background-color: hsla(0,0%,0%,.95);
+    background-image: -webkit-linear-gradient(top,  hsla(0,0%,100%,.27)  0%,
+                                                    hsla(0,0%,100%,.15) 50%,
+                                                    hsla(0,0%,30%,.4) 50%,
+                                                    hsla(0,0%,0%,1) 100%);
 }
 
 .montage-video-player .control-wrapper.hide-controls {
@@ -170,7 +170,7 @@ MARK:    Button Panel
     background-position: center center;
 }
 .montage-video-player .controller-button:active {
-        background-color: hsla(0,0%,0%,.4);
+    background-color: hsla(0,0%,0%,.4);
 }
 
 .montage-video-player .play                   { background-image: url("images/play.png"); }
@@ -200,22 +200,22 @@ MARK:    Volume Panel
 
 .montage-video-player .controller-progress {
     height: 15px;
-        box-shadow: inset 0 0px 3px 1px hsla(0,0%,0%,.5);
-        background: -webkit-repeating-linear-gradient(left, hsl(0,0%,25%) 0, hsl(0,0%,25%) 3px,
-                                                                                                                hsl(0,0%,10%) 3px, hsl(0,0%,10%) 5px);
+    box-shadow: inset 0 0px 3px 1px hsla(0,0%,0%,.5);
+    background: -webkit-repeating-linear-gradient(left, hsl(0,0%,25%) 0, hsl(0,0%,25%) 3px,
+                                                        hsl(0,0%,10%) 3px, hsl(0,0%,10%) 5px);
 }
 .montage-video-player .controller-progress:before {
-        content: "";
-        position: absolute;
+    content: "";
+    position: absolute;
     top: 0; right: 0; bottom: 0; left: 0;
-        background: -webkit-linear-gradient(top, hsla(0,0%,0%,0), hsla(0,0%,0%,.3) );
+    background: -webkit-linear-gradient(top, hsla(0,0%,0%,0), hsla(0,0%,0%,.3) );
 }
 
 .montage-video-player .volume-progress {
     width: 50%;
     height: 100%;
     background: -webkit-repeating-linear-gradient(left, hsl(195,90%,50%) 0, hsl(195,90%,50%) 3px,
-                                                                                                        transparent 3px, transparent 5px);
+                                                        transparent 3px, transparent 5px);
     -webkit-transition: width .1s ease-in-out;
 }
 
@@ -226,15 +226,15 @@ MARK:    Volume Panel
 
 .montage-video-player .volume-minus        { background-image: url("images/volume-down.png"); }
 .montage-video-player .volume-minus:active {
-        background-color: transparent;
-        background-image: url("images/volume-down.png"),
-        -webkit-linear-gradient(right, hsla(0,0%,0%,0), hsla(0,0%,0%,.5) );
+    background-color: transparent;
+    background-image: url("images/volume-down.png"),
+    -webkit-linear-gradient(right, hsla(0,0%,0%,0), hsla(0,0%,0%,.5) );
 }
 .montage-video-player .volume-plus         { background-image: url("images/volume-up.png"); }
 .montage-video-player .volume-plus:active {
-        background-color: transparent;
-        background-image: url("images/volume-up.png"),
-        -webkit-linear-gradient(left, hsla(0,0%,0%,0), hsla(0,0%,0%,.5) );
+    background-color: transparent;
+    background-image: url("images/volume-up.png"),
+    -webkit-linear-gradient(left, hsla(0,0%,0%,0), hsla(0,0%,0%,.5) );
 }
 
 .montage-video-player  .controller-volume-panel .mute               { display: none; }  /* also MUTE[muted] */