aboutsummaryrefslogtreecommitdiff
path: root/scss
diff options
context:
space:
mode:
authorJon Reid2012-06-26 14:58:10 -0700
committerJon Reid2012-06-26 14:58:10 -0700
commit2599f74d72293b809929d8a0b36fb8e721f194cd (patch)
treeca4cd45b23b8debea32f95d7dea807c77b6633b2 /scss
parentab9d14780eed98f39786fae4518e69861b34bad7 (diff)
parente4304b9ac6c58802de4dd334be1f5802533f5160 (diff)
downloadninja-2599f74d72293b809929d8a0b36fb8e721f194cd.tar.gz
Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local
Diffstat (limited to 'scss')
-rwxr-xr-xscss/imports/scss/_MainWindow.scss4
-rwxr-xr-xscss/imports/scss/_PanelUI.scss4
-rwxr-xr-xscss/imports/scss/_Workspace.scss25
-rwxr-xr-xscss/imports/scss/_toolbar.scss3
-rwxr-xr-xscss/ninja.scss1
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 @@
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/_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 {
1118 -webkit-box-orient: vertical; 1118 -webkit-box-orient: vertical;
1119 -webkit-box-align: stretch; 1119 -webkit-box-align: stretch;
1120 position:relative; 1120 position:relative;
1121 overflow: auto;
1122 height:200px;
1123
1124} 1121}
1122
1125.panel .panelBodyContent { 1123.panel .panelBodyContent {
1126 -webkit-box-sizing: border-box; 1124 -webkit-box-sizing: border-box;
1127 -webkit-box-align:stretch; 1125 -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 @@
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
18body.ws-binding .panel.ws-binding {
19 display:-webkit-box;
20}
21
22body.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}
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 @@
32@import "imports/scss/ScrollBars"; 32@import "imports/scss/ScrollBars";
33@import "imports/scss/Components"; 33@import "imports/scss/Components";
34@import "imports/scss/MontageOverrides"; 34@import "imports/scss/MontageOverrides";
35@import "imports/scss/Workspace";
35 36
36body { 37body {
37} 38}