diff options
author | Jose Antonio Marquez | 2012-01-27 12:05:17 -0800 |
---|---|---|
committer | Jose Antonio Marquez | 2012-01-27 12:05:17 -0800 |
commit | 3a754133dbc138390503341fd2e9beba3e43aa4b (patch) | |
tree | cdeae7d7dd9a30d7b4fab5afb7efad68d4ec7508 /_scss/imports | |
parent | b89a7ee8b956c96a1dcee995ea840feddc5d4b27 (diff) | |
download | ninja-3a754133dbc138390503341fd2e9beba3e43aa4b.tar.gz |
Merged old FileIO
Diffstat (limited to '_scss/imports')
19 files changed, 1 insertions, 92 deletions
diff --git a/_scss/imports/codemirror/_codemirror.scss b/_scss/imports/codemirror/_codemirror.scss index 281e7a9a..281e7a9a 100644..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 100644..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 100644..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 f9a1cfa3..f9a1cfa3 100644..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 2fda5afc..2fda5afc 100644..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 0807d894..c5552e4e 100644..100755 --- a/_scss/imports/scss/_MainWindow.scss +++ b/_scss/imports/scss/_MainWindow.scss | |||
@@ -67,7 +67,7 @@ | |||
67 | width:100%; | 67 | width:100%; |
68 | top:0px; | 68 | top:0px; |
69 | left:0px; | 69 | left:0px; |
70 | z-index: 9999; | 70 | z-index: 6995; |
71 | } | 71 | } |
72 | 72 | ||
73 | #topPanelContainer, | 73 | #topPanelContainer, |
diff --git a/_scss/imports/scss/_MenuUI.scss b/_scss/imports/scss/_MenuUI.scss index e821e5cc..e821e5cc 100644..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 e72a1502..e72a1502 100644..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 9066c3ff..9066c3ff 100644..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 index a992b793..bed29d98 100644..100755 --- a/_scss/imports/scss/_Stage.scss +++ b/_scss/imports/scss/_Stage.scss | |||
@@ -4,7 +4,6 @@ | |||
4 | // (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | 4 | // (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. |
5 | // </copyright> | 5 | // </copyright> |
6 | 6 | ||
7 | |||
8 | #middleDocArea { | 7 | #middleDocArea { |
9 | -webkit-box-orient: horizontal; | 8 | -webkit-box-orient: horizontal; |
10 | -moz-box-orient: horizontal; | 9 | -moz-box-orient: horizontal; |
@@ -21,40 +20,6 @@ | |||
21 | border-width: 1px; | 20 | border-width: 1px; |
22 | } | 21 | } |
23 | 22 | ||
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 { | 23 | #stageBG { |
59 | width:100%; | 24 | width:100%; |
60 | height:100%; | 25 | height:100%; |
@@ -85,24 +50,6 @@ | |||
85 | z-index: 1; | 50 | z-index: 1; |
86 | } | 51 | } |
87 | 52 | ||
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 { | 53 | .global3DSettings { |
107 | -webkit-transform-style: preserve-3d; | 54 | -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); | 55 | -webkit-transform:perspective(1400) matrix3d(1,0,0,0,0,1,0,0,0,0,1,0,0,0,0,1); |
@@ -112,11 +59,6 @@ | |||
112 | -webkit-perspective: 1400; | 59 | -webkit-perspective: 1400; |
113 | } | 60 | } |
114 | 61 | ||
115 | .pasteBoardSize { | ||
116 | height: 1000px; | ||
117 | width: 2000px; | ||
118 | } | ||
119 | |||
120 | #iframeContainer { | 62 | #iframeContainer { |
121 | position: absolute; | 63 | position: absolute; |
122 | top: 0px; | 64 | top: 0px; |
@@ -129,10 +71,6 @@ | |||
129 | background:$color-stage; | 71 | background:$color-stage; |
130 | } | 72 | } |
131 | 73 | ||
132 | #iframeContainer iframe { | ||
133 | |||
134 | } | ||
135 | |||
136 | #drawingCanvas { | 74 | #drawingCanvas { |
137 | position: absolute; | 75 | position: absolute; |
138 | margin: 0px; | 76 | margin: 0px; |
@@ -163,32 +101,3 @@ | |||
163 | left: 0px; | 101 | left: 0px; |
164 | z-index: 4; | 102 | z-index: 4; |
165 | } | 103 | } |
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 | } | ||
188 | |||
189 | #mainContent .CodeMirror-scroll { | ||
190 | height: 100%; | ||
191 | overflow: scroll; | ||
192 | overflow-x: auto; | ||
193 | overflow-y: auto; | ||
194 | } | ||
diff --git a/_scss/imports/scss/_Tools.scss b/_scss/imports/scss/_Tools.scss index 8614285f..8614285f 100644..100755 --- a/_scss/imports/scss/_Tools.scss +++ b/_scss/imports/scss/_Tools.scss | |||
diff --git a/_scss/imports/scss/_ToolsSample.scss b/_scss/imports/scss/_ToolsSample.scss index 8c354f14..8c354f14 100644..100755 --- a/_scss/imports/scss/_ToolsSample.scss +++ b/_scss/imports/scss/_ToolsSample.scss | |||
diff --git a/_scss/imports/scss/_UserContent.scss b/_scss/imports/scss/_UserContent.scss index e2e89186..e2e89186 100644..100755 --- a/_scss/imports/scss/_UserContent.scss +++ b/_scss/imports/scss/_UserContent.scss | |||
diff --git a/_scss/imports/scss/_mixins.scss b/_scss/imports/scss/_mixins.scss index e654aecf..e654aecf 100644..100755 --- a/_scss/imports/scss/_mixins.scss +++ b/_scss/imports/scss/_mixins.scss | |||
diff --git a/_scss/imports/scss/_toolbar.scss b/_scss/imports/scss/_toolbar.scss index 64fb32de..64fb32de 100644..100755 --- a/_scss/imports/scss/_toolbar.scss +++ b/_scss/imports/scss/_toolbar.scss | |||
diff --git a/_scss/imports/themes/_test.scss b/_scss/imports/themes/_test.scss index 87735bec..87735bec 100644..100755 --- a/_scss/imports/themes/_test.scss +++ b/_scss/imports/themes/_test.scss | |||
diff --git a/_scss/imports/themes/default/_colors.scss b/_scss/imports/themes/default/_colors.scss index 2fbe7956..2fbe7956 100644..100755 --- a/_scss/imports/themes/default/_colors.scss +++ b/_scss/imports/themes/default/_colors.scss | |||
diff --git a/_scss/imports/themes/default/_fonts.scss b/_scss/imports/themes/default/_fonts.scss index 9410dfd2..9410dfd2 100644..100755 --- a/_scss/imports/themes/default/_fonts.scss +++ b/_scss/imports/themes/default/_fonts.scss | |||
diff --git a/_scss/imports/themes/default/_mixins.scss b/_scss/imports/themes/default/_mixins.scss index e6a38a93..e6a38a93 100644..100755 --- a/_scss/imports/themes/default/_mixins.scss +++ b/_scss/imports/themes/default/_mixins.scss | |||