From 5d7e470351fd150d5e70a97332fa2f2553797499 Mon Sep 17 00:00:00 2001 From: Armen Kesablyan Date: Mon, 7 May 2012 11:09:45 -0700 Subject: Initial Setup of the binding Tool Signed-off-by: Armen Kesablyan --- scss/imports/scss/_toolbar.scss | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'scss') diff --git a/scss/imports/scss/_toolbar.scss b/scss/imports/scss/_toolbar.scss index 9bf540cd..07389db7 100755 --- a/scss/imports/scss/_toolbar.scss +++ b/scss/imports/scss/_toolbar.scss @@ -140,6 +140,10 @@ background-image:url("../images/tools/Tool-FillColor.png"); } +.bindingTool { + background-image:url("../images/tools/binding.png"); +} + .toolsList .colortoolbar { padding-left: 1px; padding-top:4px; -- cgit v1.2.3 From c80e7df1702dff09b5cc8447ab0619747fed2024 Mon Sep 17 00:00:00 2001 From: Armen Kesablyan Date: Fri, 11 May 2012 15:03:10 -0700 Subject: created the initial environment requirements for workspace to be manipulated. Signed-off-by: Armen Kesablyan --- scss/imports/scss/_MainWindow.scss | 4 ++-- scss/imports/scss/_Workspace.scss | 19 +++++++++++++++++++ scss/ninja.scss | 1 + 3 files changed, 22 insertions(+), 2 deletions(-) create mode 100755 scss/imports/scss/_Workspace.scss (limited to 'scss') 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/_Workspace.scss b/scss/imports/scss/_Workspace.scss new file mode 100755 index 00000000..7bac37ab --- /dev/null +++ b/scss/imports/scss/_Workspace.scss @@ -0,0 +1,19 @@ +// +// This file contains proprietary software owned by Motorola Mobility, Inc.
+// No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.
+// (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. +// + +//Binding Mode + +body .panel.ws-binding { + display:none; +} + +body.ws-binding .rightPanelContent .panel { + display:none; +} + +body.ws-binding .rightPanelContent .panel.ws-binding { + display:block; +} \ No newline at end of file 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 { } -- cgit v1.2.3 From 336e0e0ef242f5c472757fe3bbcdd54c04a00f1f Mon Sep 17 00:00:00 2001 From: Armen Kesablyan Date: Mon, 14 May 2012 10:32:59 -0700 Subject: Workspace: has customized Signed-off-by: Armen Kesablyan --- scss/imports/scss/_Workspace.scss | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'scss') diff --git a/scss/imports/scss/_Workspace.scss b/scss/imports/scss/_Workspace.scss index 7bac37ab..06f50a23 100755 --- a/scss/imports/scss/_Workspace.scss +++ b/scss/imports/scss/_Workspace.scss @@ -8,6 +8,7 @@ body .panel.ws-binding { display:none; + -webkit-box-flex-group:2; } body.ws-binding .rightPanelContent .panel { @@ -15,5 +16,5 @@ body.ws-binding .rightPanelContent .panel { } body.ws-binding .rightPanelContent .panel.ws-binding { - display:block; + display:-webkit-box; } \ No newline at end of file -- cgit v1.2.3 From c3452da7c18f73f45e4e6a58918f6459e7915b62 Mon Sep 17 00:00:00 2001 From: Armen Kesablyan Date: Tue, 15 May 2012 15:02:40 -0700 Subject: Finished skeleton structure for binding. Signed-off-by: Armen Kesablyan --- scss/imports/scss/_Workspace.scss | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'scss') diff --git a/scss/imports/scss/_Workspace.scss b/scss/imports/scss/_Workspace.scss index 06f50a23..c40c5e60 100755 --- a/scss/imports/scss/_Workspace.scss +++ b/scss/imports/scss/_Workspace.scss @@ -6,15 +6,20 @@ //Binding Mode -body .panel.ws-binding { +.panels .panel { + display: none; +} + +.panels .panel.ws-binding { display:none; -webkit-box-flex-group:2; } -body.ws-binding .rightPanelContent .panel { - display:none; +body.ws-binding .panel.ws-binding { + display:-webkit-box; } -body.ws-binding .rightPanelContent .panel.ws-binding { +body.ws-default .panel.default { display:-webkit-box; + -webkit-box-flex-group:1; } \ No newline at end of file -- cgit v1.2.3 From 95bef3bbd77c6c3bd01b5222986f2dd35a7218b4 Mon Sep 17 00:00:00 2001 From: Armen Kesablyan Date: Sat, 19 May 2012 14:48:35 -0700 Subject: Changes to binding view Signed-off-by: Armen Kesablyan --- scss/imports/scss/_toolbar.scss | 3 +++ 1 file changed, 3 insertions(+) (limited to 'scss') 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"); +} -- cgit v1.2.3 From cd089f6692934a68bda7c303928a7c78dd13ac07 Mon Sep 17 00:00:00 2001 From: Armen Kesablyan Date: Tue, 5 Jun 2012 12:55:34 -0700 Subject: Changes for binding View Signed-off-by: Armen Kesablyan --- 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 ed8d0656..d6da708b 100644 --- a/scss/imports/scss/_Stage.scss +++ b/scss/imports/scss/_Stage.scss @@ -140,7 +140,7 @@ padding: 0px; top: 0px; left: 0px; - z-index: 6; + z-index: 7; } -- cgit v1.2.3