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

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

1 files changed, 5 insertions, 5 deletions

diff --git a/js/panels/Timeline/Span.reel/scss/Span.scss b/js/panels/Timeline/Span.reel/scss/Span.scss
index 12d72cfa..c166114b 100644
--- a/js/panels/Timeline/Span.reel/scss/Span.scss
+++ b/js/panels/Timeline/Span.reel/scss/Span.scss
@@ -33,7 +33,7 @@ POSSIBILITY OF SUCH DAMAGE.
 /* Span.scss
  * Main SCSS file for Span component, compiled by SASS into the file css/Span.css.
  */
- 
+
 // Import theme settings
 @import "../../../../../scss/imports/themes/default/colors";
 // @import "../../../../../scss/imports/themes/default/fonts";
@@ -48,10 +48,10 @@ POSSIBILITY OF SUCH DAMAGE.
     height: 16px;
 }
 .tween_span .tween_span_bar {
-        width: 100%;
-        height: 100%;
-        background-color: #fff;
-        opacity: 0.15;
+    width: 100%;
+    height: 100%;
+    background-color: #fff;
+    opacity: 0.15;
 }
 
 .tween_span.spanHighlight .tween_span_bar {