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

diff --git a/js/panels/Timeline/Style.reel/scss/Style.scss b/js/panels/Timeline/Style.reel/scss/Style.scss
index 3fec5797..7c73d352 100644
--- a/js/panels/Timeline/Style.reel/scss/Style.scss
+++ b/js/panels/Timeline/Style.reel/scss/Style.scss
@@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE.
 /* Layer.scss
  * Main SCSS file for Layer component, compiled by SASS into the file css/Layer.css.
  */
- 
+
 // Import theme settings
 @import "../../../../../scss/imports/themes/default/colors";
 @import "../../../../../scss/imports/themes/default/mixins";
@@ -40,29 +40,29 @@ POSSIBILITY OF SUCH DAMAGE.
 @import "../../../../../scss/imports/scss/mixins";
 
 .hidden {
-        display: none;
+    display: none;
 }
 .row-editor {
-        position: relative;
-        height: 14px;
+    position: relative;
+    height: 14px;
 }
 .style-padding {
-        padding-left: 5px;
-        padding-top: 3px;
-        padding-right: 5px;
+    padding-left: 5px;
+    padding-top: 3px;
+    padding-right: 5px;
 }
 .style-row {
-        height: 20px;
-        border-bottom: 1px solid $color-menu-divider;
+    height: 20px;
+    border-bottom: 1px solid $color-menu-divider;
 }
 
 div.content-style div.editable2 {
-        height: 14px;
-        background-color: $color-panel-hilite-text !IMPORTANT;
-        color: $color-panel-hilite-bg !IMPORTANT;
-        border-width: 0px;
-        font-size: 11px;
-        overflow: hidden;
+    height: 14px;
+    background-color: $color-panel-hilite-text !IMPORTANT;
+    color: $color-panel-hilite-bg !IMPORTANT;
+    border-width: 0px;
+    font-size: 11px;
+    overflow: hidden;
     -webkit-user-select: text;
     white-space: nowrap;
     text-overflow: clip;
@@ -71,34 +71,34 @@ div.content-style div.editable2 {
 .content-style.collapsible-content,
 .content-style.collapsible-content div,
 .content-style.collapsible-content span {
-        overflow: visible;
-        text-overflow: visible;
+    overflow: visible;
+    text-overflow: visible;
 }
 div.content-style div.cell-property,
 div.content-style div.cell-value {
-        width: 45%;
-        float: left;
-        height: 18px;
-        overflow: hidden;
-        text-overflow: ellipsis;
-        white-space: nowrap;
-        line-height: 18px;
+    width: 45%;
+    float: left;
+    height: 18px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    line-height: 18px;
 }
 div.content-style div.cell-property div {
-        min-width: 90%;
-        height: 100%;
-        overflow: hidden;
-        text-overflow: ellipsis;
-        white-space: nowrap;
+    min-width: 90%;
+    height: 100%;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
 }
 
 div.content-style input.nj-skinned {
-        height: 10px;
-        font-size: 12px;
-        top: -3px;
+    height: 10px;
+    font-size: 12px;
+    top: -3px;
 }
 div.style-row .container-propvals {
-        overflow: hidden;
+    overflow: hidden;
 }
 
 .content-style .style-row.selected {