Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into GridFixes

Conflicts:
	js/helper-classes/3D/StageLine.js

1 files changed, 97 insertions, 97 deletions

diff --git a/js/panels/Timeline/Layer.reel/scss/Layer.scss b/js/panels/Timeline/Layer.reel/scss/Layer.scss
index cf8def42..186232a2 100644
--- a/js/panels/Timeline/Layer.reel/scss/Layer.scss
+++ b/js/panels/Timeline/Layer.reel/scss/Layer.scss
@@ -33,7 +33,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/fonts";
@@ -54,8 +54,8 @@ POSSIBILITY OF SUCH DAMAGE.
     -webkit-box-orient: horizontal;
 }
 .layerLabel.layerSelected {
-        background-color: $color-panel-hilite-bg;
-        color: $color-panel-hilite-text;
+    background-color: $color-panel-hilite-bg;
+    color: $color-panel-hilite-text;
 }
 .layerLabel{
     width:100%;
@@ -100,208 +100,208 @@ POSSIBILITY OF SUCH DAMAGE.
 
 .container-layer,
 .container-layer.selected {
-        background-color: $color-panel-bg;
-        color: $color-panel-text;
-        font-size: 12px;
-        text-shadow: 1px 1px 1px $color-app-shadow;
+    background-color: $color-panel-bg;
+    color: $color-panel-text;
+    font-size: 12px;
+    text-shadow: 1px 1px 1px $color-app-shadow;
 }
 .selected .container-layer {
-        background-color: $color-panel-bg;
+    background-color: $color-panel-bg;
 }
 .selected .container-layer .label-layer {
-        background-color: $color-panel-hilite-bg;
-        color: $color-panel-hilite-text;
+    background-color: $color-panel-hilite-bg;
+    color: $color-panel-hilite-text;
 }
 
 .userlayers .collapsible-label {
-        display: block;
+    display: block;
     height: 21px;
     line-height: 20px;
-        color: $color-panel-text;
-        margin-left: 80px;
-        margin-right: 40px;
+    color: $color-panel-text;
+    margin-left: 80px;
+    margin-right: 40px;
     white-space: nowrap;
     overflow: hidden;
     text-overflow: ellipsis;
 }
 
 .userlayers .layer-tag {
-        position: absolute;
-        top: 3px;
-        left: 20px;
+    position: absolute;
+    top: 3px;
+    left: 20px;
 }
 
 
 .layerSelected .label-layer {
-        background-color: $color-menu-hilite-bg;
-        color: $color-panel-hilite-text;
+    background-color: $color-menu-hilite-bg;
+    color: $color-panel-hilite-text;
 }
 .content-layer {
-        background-color: $color-panel-bg;
-        color: $color-panel-text;
+    background-color: $color-panel-bg;
+    color: $color-panel-text;
 }
 .content-layer .collapsible-label {
-        background-position: 14px 5px;
-        border-width: 0px;
+    background-position: 14px 5px;
+    border-width: 0px;
 }
 .label-layer,
 .label-position,
 .label-transform,
 .label-style,
 .label-styles {
-        position: relative;
-        border-bottom: 1px solid #505050;
-        cursor: pointer;
+    position: relative;
+    border-bottom: 1px solid #505050;
+    cursor: pointer;
 }
 
 .content-layer .collapsible-label,
 .content-layer .collapsible-content,
 .content-layer .layer-tag {
-        font-size: 11px;
+    font-size: 11px;
 }
 
 
 
 .label-layer .collapsible-label br,
 .content-style .editable br {
-        display: none;
+    display: none;
 }
 
 .collapsible-clicker {
-        position: absolute;
-        width: 10px;
-        height: 10px;
-        top: 5px;
-        left: 5px;
-        margin: 0px;
-        padding: 0px;
+    position: absolute;
+    width: 10px;
+    height: 10px;
+    top: 5px;
+    left: 5px;
+    margin: 0px;
+    padding: 0px;
     background-image: url(../images/icon-open.png);
     background-repeat: no-repeat;
 }
 .collapsible-clicker.collapsible-collapsed {
-        background-image: url(../images/icon-collapsed.png);
+    background-image: url(../images/icon-collapsed.png);
 }
 .collapsible-content .collapsible-clicker {
-        left: 12px;
+    left: 12px;
 }
 .container-layer .collapsible-content.collapsible-collapsed {
-        height: 0px;
-        overflow: hidden;
+    height: 0px;
+    overflow: hidden;
 }
 
 .label-layer .cssbutton,
 .label-style .cssbutton {
-        width: 14px;
-        height: 14px;
-        overflow: hidden;
-        position: absolute;
-        background-repeat: no-repeat;
+    width: 14px;
+    height: 14px;
+    overflow: hidden;
+    position: absolute;
+    background-repeat: no-repeat;
 }
 .label-layer .button-lock {
-        background-image: url(../images/icon-lock.png);
-        top: 3px;
-        right: 27px;
+    background-image: url(../images/icon-lock.png);
+    top: 3px;
+    right: 27px;
 }
 .label-layer .button-visible {
-        background-image: url(../images/icon-eye.png);
-        top: 3px;
-        right: 7px;
+    background-image: url(../images/icon-eye.png);
+    top: 3px;
+    right: 7px;
 }
 .label-style .button-add {
-        background-image: url(../images/icon-plus.png);
-        width: 15px;
-        height: 15px;
-        top: 3px;
-        right: 11px;
+    background-image: url(../images/icon-plus.png);
+    width: 15px;
+    height: 15px;
+    top: 3px;
+    right: 11px;
 }
 .label-style .button-delete {
-        background-image: url(../images/icon-minus.png);
-        width: 15px;
-        height: 15px;
-        top: 3px;
-        right: 31px;
+    background-image: url(../images/icon-minus.png);
+    width: 15px;
+    height: 15px;
+    top: 3px;
+    right: 31px;
 }