From c48eeb01bd726895dc577d8b843b2a75883eee07 Mon Sep 17 00:00:00 2001
From: Ananya Sen
Date: Fri, 10 Feb 2012 16:03:52 -0800
Subject: Merge from /joseeight/ninja-internal/tree/FileIO

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
---
 scss/imports/scss/_Base.scss       |  2 +-
 scss/imports/scss/_MainWindow.scss |  7 +------
 scss/imports/scss/_PanelUI.scss    |  2 +-
 scss/imports/scss/_Stage.scss      | 14 ++++++++++++++
 scss/ninja.scss                    |  1 +
 5 files changed, 18 insertions(+), 8 deletions(-)

(limited to 'scss')

diff --git a/scss/imports/scss/_Base.scss b/scss/imports/scss/_Base.scss
index 8a743174..a800610d 100755
--- 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 b33426ba..b7c7f4b7 100755
--- 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/_PanelUI.scss b/scss/imports/scss/_PanelUI.scss
index ccac99ca..bccea6fc 100755
--- 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..002ab8e8 100755
--- a/scss/ninja.scss
+++ b/scss/ninja.scss
@@ -35,6 +35,7 @@
 body {
 }
 
+
 // Codemirror
 //@import "imports/codemirror/_codemirror";
 //@import "imports/codemirror/_javascript";
-- 
cgit v1.2.3