Merge branch 'refs/heads/master' into components

Conflicts:
	js/components/treeview/ninja-leaf.reel/ninja-leaf.js

Signed-off-by: Valerio Virgillito <valerio@motorola.com>

1 files changed, 117 insertions, 0 deletions

diff --git a/js/panels/Timeline/TimelineTrack.reel/css/TimelineTrack.css b/js/panels/Timeline/TimelineTrack.reel/css/TimelineTrack.css
new file mode 100644
index 00000000..ddaccd32
--- /dev/null
+++ b/js/panels/Timeline/TimelineTrack.reel/css/TimelineTrack.css
@@ -0,0 +1,117 @@
+@charset "UTF-8";
+/* TimelineTrack.scss
+ * Main SCSS file for TimelineTrack component, compiled by SASS into the file css/TimelineTrack.css.
+ */
+/* <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> */
+/*
+ * _colors.scss
+ * Defines the colors for the UI of the application.
+ * To create a new theme, copy this file and change the values as desired.
+ * Note: Some colors are defined as both rgb and rgba; some of the rgba versions have multiple a values.
+ */
+/* Colors for radio buttons and other form elements */
+/* Base colors for dividers 
+ *
+ * Dividers consist of a div with a background color and either 
+ * a top & bottom border (in the case of horizontal dividers)
+ * or a left & right border (in the case of vertical dividers),
+ * for a total of three different colors.
+ * 
+ */
+/* top and left */
+/* Middle */
+/* Bottom and right */
+/* Main background color of entire app */
+/* Main app background color. */
+/* rgba version */
+/* Main app border color */
+/* color of drop shadows */
+/* Stage color */
+/* body border color */
+/* Body background color */
+/* Colors for main dropdown menus: background & text for both regular and highlighted states, dividers */
+/* Colors for tools: background, text, how they interact with the UI */
+/* Colors for panels: background & text, both regular and highlighted states, dividers, borders, shadows, etc. */
+/* used for editable items in their non-edit state, etc. */
+/* Border for panel and for block elements */
+/* Shadow for text and block elements */
+/* Colors for scroll bars */
+/* <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> */
+/*
+ * themes/themename/mixins.scss
+ * Mixins that are theme-dependent (e.g. sprite mixins, etc)
+ */
+/* <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> */
+/*
+ * mixins.scss
+ * Generic mixins.  Theme-specific mixins (e.g. for sprites) 
+ * should go in the theme/themename/mixins.scss file.
+ */
+/* line 16, ../scss/TimelineTrack.scss */
+.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;
+}
+
+/* line 28, ../scss/TimelineTrack.scss */
+.keyframe {
+  position: absolute;
+  height: 16px;
+  width: 4px;
+  background-color: white;
+}
+
+/* line 36, ../scss/TimelineTrack.scss */
+.defaultSpan {
+  position: absolute;
+  height: 16px;
+  opacity: 0.3;
+  background-color: white;
+}
+
+/* line 45, ../scss/TimelineTrack.scss */
+.tl_layertracks .content-position {
+  height: 63px;
+}
+
+/* line 48, ../scss/TimelineTrack.scss */
+.tl_layertracks .content-transform {
+  height: 106px;
+}
+
+/* line 52, ../scss/TimelineTrack.scss */
+.tl_layertracks .collapsible-content.collapsible-collapsed {
+  overflow: hidden;
+  height: 0px;
+}
+
+/* line 57, ../scss/TimelineTrack.scss */
+.tl_layertracks .collapsible-content .collapsible-label {
+  height: 21px;
+  background-color: #474747;
+  color: white;
+}
+
+/* line 63, ../scss/TimelineTrack.scss */
+.tl_layertracks .collapsible-content .timeline-track {
+  height: 21px;
+}