diff options
author | Valerio Virgillito | 2012-06-26 13:15:26 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-06-26 13:15:26 -0700 |
commit | 87a8b62f71bb72274c3dd1fa389e88c12d482ebb (patch) | |
tree | bf9f995e2972c0a61355f24e64231cdf0b2c86b5 /scss/imports | |
parent | 8821e662484aedb027e26a873883e6ca3fb55a51 (diff) | |
parent | a95bba25c3ba6e31784a452e9b94748cc870ba5d (diff) | |
download | ninja-87a8b62f71bb72274c3dd1fa389e88c12d482ebb.tar.gz |
Merge pull request #323 from dhg637/binding
Binding View - Binding Tool & Binding Panel
Diffstat (limited to 'scss/imports')
-rwxr-xr-x | scss/imports/scss/_MainWindow.scss | 4 | ||||
-rwxr-xr-x | scss/imports/scss/_Workspace.scss | 25 | ||||
-rwxr-xr-x | scss/imports/scss/_toolbar.scss | 3 |
3 files changed, 30 insertions, 2 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 @@ | |||
206 | background:$color-stage url('../images/temp/ruler-top.png'); | 206 | background:$color-stage url('../images/temp/ruler-top.png'); |
207 | height:15px; | 207 | height:15px; |
208 | margin-bottom: 0px; | 208 | margin-bottom: 0px; |
209 | border-right: 11px solid black; | 209 | //border-right: 11px solid black; |
210 | } | 210 | } |
211 | 211 | ||
212 | .rulerLeft { | 212 | .rulerLeft { |
@@ -214,7 +214,7 @@ | |||
214 | // TODO: temporary background please replace when component is implemented | 214 | // TODO: temporary background please replace when component is implemented |
215 | background:$color-stage url('../images/temp/ruler-left.png'); | 215 | background:$color-stage url('../images/temp/ruler-left.png'); |
216 | width:16px; | 216 | width:16px; |
217 | border-bottom: 11px solid black; | 217 | //border-bottom: 11px solid black; |
218 | } | 218 | } |
219 | 219 | ||
220 | #stateBar { | 220 | #stateBar { |
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 @@ | |||
1 | // <copyright> | ||
2 | // This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | ||
3 | // No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> | ||
4 | // (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | ||
5 | // </copyright> | ||
6 | |||
7 | //Binding Mode | ||
8 | |||
9 | .panels .panel { | ||
10 | display: none; | ||
11 | } | ||
12 | |||
13 | .panels .panel.ws-binding { | ||
14 | display:none; | ||
15 | -webkit-box-flex-group:2; | ||
16 | } | ||
17 | |||
18 | body.ws-binding .panel.ws-binding { | ||
19 | display:-webkit-box; | ||
20 | } | ||
21 | |||
22 | body.ws-default .panel.default { | ||
23 | display:-webkit-box; | ||
24 | -webkit-box-flex-group:1; | ||
25 | } \ 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 @@ | |||
133 | background-image:url("../images/tools/Tool-FillColor.png"); | 133 | background-image:url("../images/tools/Tool-FillColor.png"); |
134 | } | 134 | } |
135 | 135 | ||
136 | .bindingTool { | ||
137 | background-image:url("../images/tools/binding.png"); | ||
138 | } | ||