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>

6 files changed, 38 insertions, 8 deletions

diff --git a/scss/imports/scss/_Base.scss b/scss/imports/scss/_Base.scss
index 8a743174..a800610d 100644
--- a/scss/imports/scss/_Base.scss
+++ b/scss/imports/scss/_Base.scss
@@ -134,7 +134,7 @@ button.nj-skinned {
         cursor: pointer;
         text-shadow: 1px 1px 1px $color-app-shadow
 }
-button.nj-skinned:active {
+button.nj-skinned:active, button.nj-skinned.active {
         background-image: -webkit-linear-gradient(top, $color-formgrad-bottom 0%, $color-formgrad-top 100%); 
 }
 button.nj-skinned:hover {
diff --git a/scss/imports/scss/_MainWindow.scss b/scss/imports/scss/_MainWindow.scss
index 23ace69b..a2d5eef4 100644
--- a/scss/imports/scss/_MainWindow.scss
+++ b/scss/imports/scss/_MainWindow.scss
@@ -85,7 +85,7 @@
 #bottomPanelContainer {
     //border: 1px solid #333;
     background: transparent;
-     
+    height: 150px;
     min-height:80px;
     max-height:50%;
     overflow:auto;
@@ -291,11 +291,6 @@
     overflow-y:hidden;
 }
 
-.contextMenu {
-    position:absolute;
-    z-index:999;
-}
-
 #openDocumentsTabComponent {
         height: 25px;
     position: relative;
diff --git a/scss/imports/scss/_MontageOverrides.scss b/scss/imports/scss/_MontageOverrides.scss
new file mode 100644
index 00000000..65b9ede0
--- /dev/null
+++ b/scss/imports/scss/_MontageOverrides.scss
@@ -0,0 +1,19 @@
+// <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>
+
+
+//MontageOverrides.scss
+//Montage overrides.
+//Note that colors and font definitions go in 
+//_scss/themes/themename/_colors.scss and _scss/themes/themename/_fonts.scss
+
+.montage-modal {
+    border: 0px;
+
+}
+.montage-popup-container {
+    background: none;
+}
\ No newline at end of file
diff --git a/scss/imports/scss/_PanelUI.scss b/scss/imports/scss/_PanelUI.scss
index ccac99ca..bccea6fc 100644
--- a/scss/imports/scss/_PanelUI.scss
+++ b/scss/imports/scss/_PanelUI.scss
@@ -98,7 +98,7 @@
 }
 
 #timelinePanel {
-    height: 116px;
+    height: 100%;
 }
 
 //  Only used by Animation Presets Panel currently  
diff --git a/scss/imports/scss/_Stage.scss b/scss/imports/scss/_Stage.scss
index 7b7db576..e77be724 100644
--- a/scss/imports/scss/_Stage.scss
+++ b/scss/imports/scss/_Stage.scss
@@ -192,3 +192,17 @@
     overflow-x: auto;
     overflow-y: auto;
 }
+.montage-editor-frame {
+    position:absolute;
+    z-index:7;
+    top: 0;
+    left:0;
+    display:none;
+    -webkit-user-select: initial;
+}
+.montage-editor {
+    padding:0px;
+    word-wrap: normal;
+    
+
+    }
diff --git a/scss/ninja.scss b/scss/ninja.scss
index 1061780a..13db5588 100755
--- a/scss/ninja.scss
+++ b/scss/ninja.scss
@@ -31,10 +31,12 @@
 @import "imports/scss/UserContent";
 @import "imports/scss/ScrollBars";
 @import "imports/scss/Components";
+@import "imports/scss/MontageOverrides";
 
 body {
 }
 
+
 // Codemirror
 //@import "imports/codemirror/_codemirror";
 //@import "imports/codemirror/_javascript";