Merge branch 'refs/heads/master' into binding

Conflicts:
	js/components/hintable.reel/hintable.js

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

2 files changed, 74 insertions, 0 deletions

diff --git a/js/panels/Timeline/Span.reel/scss/Span.scss b/js/panels/Timeline/Span.reel/scss/Span.scss
new file mode 100644
index 00000000..31781f87
--- /dev/null
+++ b/js/panels/Timeline/Span.reel/scss/Span.scss
@@ -0,0 +1,65 @@
+@charset "UTF-8";
+
+/* <copyright>
+ This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
+ No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
+ (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
+ </copyright> */
+
+/* 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";
+@import "../../../../../scss/imports/themes/default/mixins";
+
+// Import generic mixins and styles
+@import "../../../../../scss/imports/scss/mixins";
+// @import "../../../../../scss/imports/scss/Base";
+
+.tween_span{
+    position: absolute;
+    height: 16px;
+}
+.tween_span .tween_span_bar {
+        width: 100%;
+        height: 100%;
+        background-color: #fff;
+        opacity: 0.15;
+}
+
+.tween_span.spanHighlight .tween_span_bar {
+    background-color: #a0c8ff;
+    opacity: 0.4;
+}
+
+.container-easing-choice {
+  position: absolute;
+  top: 2px;
+  right: 8px;
+  font-size: 10px;
+  line-height: 8px;
+  border: 1px solid $color-menu-border;
+  color: $color-menu-text;
+  background-color: $color-menu-bg;
+}
+.container-easing-choice,
+.container-easing-choice .easing-choice,
+.container-easing-choices .easing-choices {
+  font-size: 10px;
+  width: 70px;
+  white-space: nowrap;
+}
+.container-easing-choice,
+.container-easing-choice .easing-choice {
+  height: 10px;
+}
+.container-easing-choice .easing-choice {
+  position: absolute;
+  top: 0px;
+  left: 3px;
+  width: 67px;
+  cursor: pointer;
+}
diff --git a/js/panels/Timeline/Span.reel/scss/config.rb b/js/panels/Timeline/Span.reel/scss/config.rb
new file mode 100644
index 00000000..e5a99b70
--- /dev/null
+++ b/js/panels/Timeline/Span.reel/scss/config.rb
@@ -0,0 +1,9 @@
+# Require any additional compass plugins here.
+# Set this to the root of your project when deployed:
+http_path = "/"
+css_dir = "../css"
+sass_dir = ""
+images_dir = "../images/"
+javascripts_dir = "../js"
+# To enable relative paths to assets via compass helper functions. Uncomment:
+# relative_assets = true