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>

2 files changed, 79 insertions, 0 deletions

diff --git a/js/panels/Timeline/Style.reel/scss/Style.scss b/js/panels/Timeline/Style.reel/scss/Style.scss
new file mode 100644
index 00000000..f15f553d
--- /dev/null
+++ b/js/panels/Timeline/Style.reel/scss/Style.scss
@@ -0,0 +1,70 @@
+/* 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/mixins";
+
+// Import generic mixins and styles
+@import "../../../../../_scss/imports/scss/mixins";
+
+.hidden {
+        display: none;
+}
+.row-editor {
+        position: relative;
+        height: 14px;
+}
+.style-padding {
+        padding-left: 5px;
+        padding-top: 3px;
+        padding-right: 5px;
+}
+.style-row {
+        height: 20px;
+        border-bottom: 1px solid $color-menu-divider;
+}
+
+div.content-style div.editable2 {
+        height: 14px;
+        background-color: $color-panel-hilite-text !IMPORTANT;
+        color: $color-panel-hilite-bg !IMPORTANT;
+        border-width: 0px;
+        font-size: 11px;
+        overflow: hidden;
+    -webkit-user-select: text;
+    white-space: nowrap;
+    text-overflow: clip;
+    width: 100%;
+}
+.content-style.collapsible-content,
+.content-style.collapsible-content div,
+.content-style.collapsible-content span {
+        overflow: visible;
+        text-overflow: visible;
+}
+div.content-style div.cell-property,
+div.content-style div.cell-value {
+        width: 45%;
+        float: left;
+        height: 18px;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+        line-height: 18px;
+}
+div.content-style div.cell-property div {
+        min-width: 90%;
+        height: 100%;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+}
+
+div.content-style input.nj-skinned {
+        height: 10px;
+        font-size: 12px;
+        top: -3px;
+}
+
diff --git a/js/panels/Timeline/Style.reel/scss/config.rb b/js/panels/Timeline/Style.reel/scss/config.rb
new file mode 100644
index 00000000..e5a99b70
--- /dev/null
+++ b/js/panels/Timeline/Style.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