From dece82791f43b5e8d278aba89cf8d6119af1478f Mon Sep 17 00:00:00 2001
From: Ananya Sen
Date: Mon, 9 Apr 2012 13:11:40 -0700
Subject: - Decouple code editor from stage document switching logic - cleaning
 up

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
---
 scss/imports/scss/_Stage.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'scss')

diff --git a/scss/imports/scss/_Stage.scss b/scss/imports/scss/_Stage.scss
index 587903d2..3a8c0997 100644
--- a/scss/imports/scss/_Stage.scss
+++ b/scss/imports/scss/_Stage.scss
@@ -190,7 +190,7 @@
     height: 100%;
     overflow: scroll;
     overflow-x: auto;
-    overflow-y: auto;
+    overflow-y: hidden;
 }
 
 .montage-editor-frame {
-- 
cgit v1.2.3


From a7548b4c53de8f42cb5e0fb1c054eba6f7c45afb Mon Sep 17 00:00:00 2001
From: Ananya Sen
Date: Tue, 24 Apr 2012 16:45:47 -0700
Subject: IKNINJA-1529 : zooming such that cursor position can be calculated
 accurately

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
---
 scss/imports/scss/_Stage.scss | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'scss')

diff --git a/scss/imports/scss/_Stage.scss b/scss/imports/scss/_Stage.scss
index 3a8c0997..6206f27f 100644
--- a/scss/imports/scss/_Stage.scss
+++ b/scss/imports/scss/_Stage.scss
@@ -188,9 +188,7 @@
 
 #mainContent .CodeMirror-scroll {
     height: 100%;
-    overflow: scroll;
-    overflow-x: auto;
-    overflow-y: hidden;
+    overflow: auto;
 }
 
 .montage-editor-frame {
-- 
cgit v1.2.3


From 2f21eb37a4e7afb4ba3273b3ec50964717448b2f Mon Sep 17 00:00:00 2001
From: Valerio Virgillito
Date: Thu, 3 May 2012 17:16:04 -0700
Subject: Removing more id and changing the appropriate CSS for them

Signed-off-by: Valerio Virgillito <valerio@motorola.com>
---
 scss/imports/scss/_MainWindow.scss | 13 ++++---------
 scss/imports/scss/_PanelUI.scss    |  1 +
 2 files changed, 5 insertions(+), 9 deletions(-)

(limited to 'scss')

diff --git a/scss/imports/scss/_MainWindow.scss b/scss/imports/scss/_MainWindow.scss
index f6068ddb..ace890aa 100755
--- a/scss/imports/scss/_MainWindow.scss
+++ b/scss/imports/scss/_MainWindow.scss
@@ -200,7 +200,7 @@
     background-color: #474747;
 }
 
-#mainContainer #rulerTop {
+#mainContainer .rulerTop {
   display: none;
     // TODO: temporary background please replace when component is implemented
     background:$color-stage url('../images/temp/ruler-top.png');
@@ -209,7 +209,7 @@
   border-right: 11px solid black;
 }
 
-#rulerLeft {
+.rulerLeft {
   display: none;
     // TODO: temporary background please replace when component is implemented
     background:$color-stage url('../images/temp/ruler-left.png');
@@ -305,12 +305,7 @@
     box-orient: vertical;
 }
 
-// TODO: REMOVE THIS
-#rightPanelContent {
-    overflow-y:hidden;
-}
-
-#openDocumentsTabComponent {
+.openDocumentsTab {
 	height: 25px;
     position: relative;
     overflow: hidden;
@@ -343,7 +338,7 @@
 	background-color: #7f7f7f;
 }
 
-#documentBar {
+.documentBar {
 	height: 25px;
 	width: 1000px;
 	position: relative;
diff --git a/scss/imports/scss/_PanelUI.scss b/scss/imports/scss/_PanelUI.scss
index d60dae59..dd8cee04 100755
--- a/scss/imports/scss/_PanelUI.scss
+++ b/scss/imports/scss/_PanelUI.scss
@@ -1240,6 +1240,7 @@ display: -webkit-box;
 
 .rightPanelContent {
     position:absolute;
+    overflow-y:hidden;
     height:100%;
     width:100%;
 }
-- 
cgit v1.2.3


From f1f2e65712d7c5a163dd6fdbd8f5911555c3f377 Mon Sep 17 00:00:00 2001
From: Valerio Virgillito
Date: Thu, 3 May 2012 17:46:23 -0700
Subject: finishing to replace all id with data-montage-id

Signed-off-by: Valerio Virgillito <valerio@motorola.com>
---
 scss/imports/scss/_Stage.scss | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'scss')

diff --git a/scss/imports/scss/_Stage.scss b/scss/imports/scss/_Stage.scss
index 6206f27f..4644e3ba 100644
--- a/scss/imports/scss/_Stage.scss
+++ b/scss/imports/scss/_Stage.scss
@@ -133,7 +133,7 @@
    
 }
 
-#drawingCanvas {
+.drawingCanvas {
     position: absolute;
     margin: 0px;
     border: none;
@@ -144,7 +144,7 @@
 }
 
 
-#stageCanvas {
+.stageCanvas {
     position: absolute;
     margin: 0px;
     border: none;
@@ -154,7 +154,7 @@
     z-index: 5;
 }
 
-#layoutCanvas {
+.layoutCanvas {
     position: absolute;
     margin: 0px;
     border: none;
-- 
cgit v1.2.3


From 26248a5fd11954b670c36cde25a13af990774c8c Mon Sep 17 00:00:00 2001
From: Valerio Virgillito
Date: Fri, 4 May 2012 14:08:20 -0700
Subject: Fixing the tools list separators and document bar disabled state

Signed-off-by: Valerio Virgillito <valerio@motorola.com>
---
 scss/imports/scss/_MainWindow.scss | 1 -
 scss/imports/scss/_toolbar.scss    | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

(limited to 'scss')

diff --git a/scss/imports/scss/_MainWindow.scss b/scss/imports/scss/_MainWindow.scss
index ace890aa..2fdf0ac6 100755
--- a/scss/imports/scss/_MainWindow.scss
+++ b/scss/imports/scss/_MainWindow.scss
@@ -340,7 +340,6 @@
 
 .documentBar {
 	height: 25px;
-	width: 1000px;
 	position: relative;
 	overflow: hidden;
 	color: white;
diff --git a/scss/imports/scss/_toolbar.scss b/scss/imports/scss/_toolbar.scss
index 9bf540cd..e4bf64bf 100755
--- a/scss/imports/scss/_toolbar.scss
+++ b/scss/imports/scss/_toolbar.scss
@@ -26,6 +26,7 @@
     border-top: 1px solid #232323;
     border-bottom: 1px solid #3A3A3A;
     margin:2px;
+    width:100%;
 }
 
 .toolbutton {
-- 
cgit v1.2.3