Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local

5 files changed, 32 insertions, 5 deletions

diff --git a/scss/imports/scss/_MainWindow.scss b/scss/imports/scss/_MainWindow.scss
index 2fdf0ac6..31ac97ea 100755
--- a/scss/imports/scss/_MainWindow.scss
+++ b/scss/imports/scss/_MainWindow.scss
@@ -206,7 +206,7 @@
     background:$color-stage url('../images/temp/ruler-top.png');
     height:15px;
     margin-bottom: 0px;
-  border-right: 11px solid black;
+  //border-right: 11px solid black;
 }
 
 .rulerLeft {
@@ -214,7 +214,7 @@
     // TODO: temporary background please replace when component is implemented
     background:$color-stage url('../images/temp/ruler-left.png');
     width:16px;
-  border-bottom: 11px solid black;
+  //border-bottom: 11px solid black;
 }
 
 #stateBar {
diff --git a/scss/imports/scss/_PanelUI.scss b/scss/imports/scss/_PanelUI.scss
index 543901ad..a03991f9 100755
--- a/scss/imports/scss/_PanelUI.scss
+++ b/scss/imports/scss/_PanelUI.scss
@@ -1118,10 +1118,8 @@ button.panel-button {
     -webkit-box-orient: vertical;
     -webkit-box-align: stretch;
     position:relative;
-    overflow: auto;
-    height:200px;
-
 }
+
 .panel .panelBodyContent {
     -webkit-box-sizing: border-box;
     -webkit-box-align:stretch;
diff --git a/scss/imports/scss/_Workspace.scss b/scss/imports/scss/_Workspace.scss
new file mode 100755
index 00000000..c40c5e60
--- /dev/null
+++ b/scss/imports/scss/_Workspace.scss
@@ -0,0 +1,25 @@
+// <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>
+
+//Binding Mode
+
+.panels .panel {
+    display: none;
+}
+
+.panels .panel.ws-binding {
+    display:none;
+    -webkit-box-flex-group:2;
+}
+
+body.ws-binding .panel.ws-binding {
+    display:-webkit-box;
+}
+
+body.ws-default .panel.default {
+    display:-webkit-box;
+    -webkit-box-flex-group:1;
+}
\ No newline at end of file
diff --git a/scss/imports/scss/_toolbar.scss b/scss/imports/scss/_toolbar.scss
index 9440fa85..422e79e7 100755
--- a/scss/imports/scss/_toolbar.scss
+++ b/scss/imports/scss/_toolbar.scss
@@ -133,3 +133,6 @@
     background-image:url("../images/tools/Tool-FillColor.png");
 }
 
+.bindingTool {
+  background-image:url("../images/tools/binding.png");
+}
diff --git a/scss/ninja.scss b/scss/ninja.scss
index 13db5588..73ca8ff2 100755
--- a/scss/ninja.scss
+++ b/scss/ninja.scss
@@ -32,6 +32,7 @@
 @import "imports/scss/ScrollBars";
 @import "imports/scss/Components";
 @import "imports/scss/MontageOverrides";
+@import "imports/scss/Workspace";
 
 body {
 }