aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-02-08 14:08:35 -0800
committerJose Antonio Marquez2012-02-08 14:08:35 -0800
commit5ee983dbbc0dddf18771da1925ccf634a67c365b (patch)
tree4b3e49624258e39b400476875c084e4438589110
parent553e06c9e903e845cb9cd73971d59561fca375c7 (diff)
parentab12be4e9a0d9fee4450795077b0107983b5682e (diff)
downloadninja-5ee983dbbc0dddf18771da1925ccf634a67c365b.tar.gz
Merge branch 'refs/heads/NinjaInternal' into FileIO
Conflicts: scss/imports/scss/_Stage.scss
-rwxr-xr-xscss/config.rb (renamed from _scss/config.rb)0
-rwxr-xr-xscss/imports/codemirror/_codemirror.scss (renamed from _scss/imports/codemirror/_codemirror.scss)0
-rwxr-xr-xscss/imports/codemirror/_css.scss (renamed from _scss/imports/codemirror/_css.scss)0
-rwxr-xr-xscss/imports/codemirror/_javascript.scss (renamed from _scss/imports/codemirror/_javascript.scss)0
-rwxr-xr-xscss/imports/scss/_Base.scss (renamed from _scss/imports/scss/_Base.scss)0
-rwxr-xr-xscss/imports/scss/_Components.scss (renamed from _scss/imports/scss/_Components.scss)0
-rwxr-xr-xscss/imports/scss/_MainWindow.scss (renamed from _scss/imports/scss/_MainWindow.scss)0
-rwxr-xr-xscss/imports/scss/_MenuUI.scss (renamed from _scss/imports/scss/_MenuUI.scss)0
-rwxr-xr-xscss/imports/scss/_PanelUI.scss (renamed from _scss/imports/scss/_PanelUI.scss)0
-rwxr-xr-xscss/imports/scss/_ScrollBars.scss (renamed from _scss/imports/scss/_ScrollBars.scss)0
-rw-r--r--scss/imports/scss/_Stage.scss194
-rwxr-xr-xscss/imports/scss/_Tools.scss (renamed from _scss/imports/scss/_Tools.scss)0
-rwxr-xr-xscss/imports/scss/_ToolsSample.scss (renamed from _scss/imports/scss/_ToolsSample.scss)0
-rwxr-xr-xscss/imports/scss/_UserContent.scss (renamed from _scss/imports/scss/_UserContent.scss)0
-rwxr-xr-xscss/imports/scss/_mixins.scss (renamed from _scss/imports/scss/_mixins.scss)0
-rwxr-xr-xscss/imports/scss/_toolbar.scss (renamed from _scss/imports/scss/_toolbar.scss)0
-rwxr-xr-xscss/imports/themes/_test.scss (renamed from _scss/imports/themes/_test.scss)0
-rwxr-xr-xscss/imports/themes/default/_colors.scss (renamed from _scss/imports/themes/default/_colors.scss)0
-rwxr-xr-xscss/imports/themes/default/_fonts.scss (renamed from _scss/imports/themes/default/_fonts.scss)0
-rwxr-xr-xscss/imports/themes/default/_mixins.scss (renamed from _scss/imports/themes/default/_mixins.scss)0
-rwxr-xr-xscss/ninja.scss (renamed from _scss/ninja.scss)1
21 files changed, 194 insertions, 1 deletions
diff --git a/_scss/config.rb b/scss/config.rb
index 23327bde..23327bde 100755
--- a/_scss/config.rb
+++ b/scss/config.rb
diff --git a/_scss/imports/codemirror/_codemirror.scss b/scss/imports/codemirror/_codemirror.scss
index 281e7a9a..281e7a9a 100755
--- a/_scss/imports/codemirror/_codemirror.scss
+++ b/scss/imports/codemirror/_codemirror.scss
diff --git a/_scss/imports/codemirror/_css.scss b/scss/imports/codemirror/_css.scss
index fb870e84..fb870e84 100755
--- a/_scss/imports/codemirror/_css.scss
+++ b/scss/imports/codemirror/_css.scss
diff --git a/_scss/imports/codemirror/_javascript.scss b/scss/imports/codemirror/_javascript.scss
index 1124e279..1124e279 100755
--- a/_scss/imports/codemirror/_javascript.scss
+++ b/scss/imports/codemirror/_javascript.scss
diff --git a/_scss/imports/scss/_Base.scss b/scss/imports/scss/_Base.scss
index 8a743174..8a743174 100755
--- a/_scss/imports/scss/_Base.scss
+++ b/scss/imports/scss/_Base.scss
diff --git a/_scss/imports/scss/_Components.scss b/scss/imports/scss/_Components.scss
index c4182c73..c4182c73 100755
--- a/_scss/imports/scss/_Components.scss
+++ b/scss/imports/scss/_Components.scss
diff --git a/_scss/imports/scss/_MainWindow.scss b/scss/imports/scss/_MainWindow.scss
index b33426ba..b33426ba 100755
--- a/_scss/imports/scss/_MainWindow.scss
+++ b/scss/imports/scss/_MainWindow.scss
diff --git a/_scss/imports/scss/_MenuUI.scss b/scss/imports/scss/_MenuUI.scss
index e1fb149a..e1fb149a 100755
--- a/_scss/imports/scss/_MenuUI.scss
+++ b/scss/imports/scss/_MenuUI.scss
diff --git a/_scss/imports/scss/_PanelUI.scss b/scss/imports/scss/_PanelUI.scss
index 21ada556..21ada556 100755
--- a/_scss/imports/scss/_PanelUI.scss
+++ b/scss/imports/scss/_PanelUI.scss
diff --git a/_scss/imports/scss/_ScrollBars.scss b/scss/imports/scss/_ScrollBars.scss
index 1c2f30ea..1c2f30ea 100755
--- a/_scss/imports/scss/_ScrollBars.scss
+++ b/scss/imports/scss/_ScrollBars.scss
diff --git a/scss/imports/scss/_Stage.scss b/scss/imports/scss/_Stage.scss
new file mode 100644
index 00000000..7b7db576
--- /dev/null
+++ b/scss/imports/scss/_Stage.scss
@@ -0,0 +1,194 @@
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
8#middleDocArea {
9 -webkit-box-orient: horizontal;
10 -moz-box-orient: horizontal;
11 box-orient: horizontal;
12
13 -moz-box-flex: 1;
14 -webkit-box-flex: 1;
15 box-flex: 1;
16
17 margin: 1px;
18 margin-bottom:3px;
19
20 border-style: solid;
21 border-width: 1px;
22}
23
24// Used for the Iframe Version
25#mainStageIFrame {
26 border: none;
27 margin: 4px;
28}
29
30
31
32
33#mainStageArea {
34 -moz-box-flex: 1;
35 -webkit-box-flex: 1;
36 box-flex: 1;
37
38 overflow: scroll;
39 position: relative;
40
41 margin: 0px;
42 padding: 0px;
43 border: none;
44}
45
46#pasteBoard {
47 // position: relative;
48 top: 0px;
49 left: 0px;
50 margin: 0px;
51 padding: 0px;
52 border: none;
53
54 // overflow: scroll;
55}
56
57
58#stageBG {
59 width:100%;
60 height:100%;
61 background-color: red;
62 position: absolute;
63 margin-left: auto;
64 margin-right: auto;
65 left: 0;
66 right: 0;
67 top: 150px;
68
69 z-index: 0;
70}
71
72#stageUserContent {
73 width:100%;
74 height:100%;
75 background-color: transparent;
76 border : 1px solid $color-body-border;
77
78 position: absolute;
79 margin-left: auto;
80 margin-right: auto;
81 left: 0;
82 right: 0;
83 top: 150px;
84
85 z-index: 1;
86}
87
88#stageParent {
89 // we aren't entirely sure why this works but putting a slight opacity on this div
90 // seems to keep the users content from breaking through the overlay canvas and eating mouse events
91 // John Mayhew
92
93 z-index: 2;
94 opacity: 0.99;
95 // height: 1000px;
96 // width: 2000px;
97 position: absolute;
98 margin: 0px;
99 border: none;
100 padding: 0px;
101 top: 0px;
102 left: 0px;
103 // background-color: red;
104}
105
106.global3DSettings {
107 -webkit-transform-style: preserve-3d;
108 -webkit-transform:perspective(1400) matrix3d(1,0,0,0,0,1,0,0,0,0,1,0,0,0,0,1);
109}
110
111.perspective3D {
112 -webkit-perspective: 1400;
113}
114
115.pasteBoardSize {
116 height: 1000px;
117 width: 2000px;
118}
119
120#iframeContainer {
121 position: absolute;
122 top: 0px;
123 left: 0px;
124 margin: 0px;
125 padding: 0px;
126 width:100%;
127 height:100%;
128 overflow:scroll;
129 background:$color-stage;
130}
131
132#iframeContainer iframe {
133
134}
135
136#drawingCanvas {
137 position: absolute;
138 margin: 0px;
139 border: none;
140 padding: 0px;
141 top: 0px;
142 left: 0px;
143 z-index: 6;
144}
145
146
147#stageCanvas {
148 position: absolute;
149 margin: 0px;
150 border: none;
151 padding: 0px;
152 top: 0px;
153 left: 0px;
154 z-index: 5;
155}
156
157#layoutCanvas {
158 position: absolute;
159 margin: 0px;
160 border: none;
161 padding: 0px;
162 top: 0px;
163 left: 0px;
164 z-index: 4;
165}
166
167#codeViewContainer {
168 position: absolute;
169 top: 0px;
170 left: 0px;
171 margin: 0px;
172 padding: 0px;
173 background: $color-app-bg;
174 width:100%;
175 height:100%;
176 display:none;
177}
178
179#mainContent #codeMirror_1 {
180 height:100%;
181}
182
183#mainContent .CodeMirror {
184 width: 100%;
185 height: 100%;
186 background: white;
187}