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

Conflicts:
	css/ninja.css
	js/stage/stage.reel/stage.html
	js/tools/TextTool.js
	node_modules/labs/rich-text-editor.reel/rich-text-editor.css
	node_modules/labs/rich-text-editor.reel/rich-text-editor.html
	node_modules/labs/rich-text-editor.reel/rich-text-editor.js
	node_modules/labs/rich-text-editor.reel/rich-text-resizer.js
	node_modules/labs/rich-text-editor.reel/rich-text-sanitizer.js

Signed-off-by: Armen Kesablyan <armen@motorola.com>

1 files changed, 26 insertions, 0 deletions

diff --git a/js/panels/Timeline/Track.reel/css/Track.css b/js/panels/Timeline/Track.reel/css/Track.css
new file mode 100644
index 00000000..c2353bac
--- /dev/null
+++ b/js/panels/Timeline/Track.reel/css/Track.css
@@ -0,0 +1,26 @@
+.tracklane{
+    height: 19px;
+    width: 100%;
+    color: white;
+    padding-top: 2px;
+    border-bottom: #444;
+    border-bottom-style: solid;
+    border-bottom-width: thin;
+    background-image: url("../images/gridline.jpg");
+    overflow: hidden;
+}
+
+.keyframe{
+    position: absolute;
+    height: 16px;
+    width: 4px;
+    background-color: white;
+
+}
+
+.defaultSpan{
+    position: absolute;
+    height: 16px;
+    opacity: 0.3;
+    background-color: white;
+}
\ No newline at end of file