diff options
author | Ananya Sen | 2012-05-07 15:43:24 -0700 |
---|---|---|
committer | Ananya Sen | 2012-05-07 15:43:24 -0700 |
commit | c51a1317a767dcd5dfded822815305d4330f4892 (patch) | |
tree | 9a04f0242bd3b7cd862fe0c610389276a564d6f7 | |
parent | 526e423e4a2734c2b139af23911e912452a4443f (diff) | |
download | ninja-c51a1317a767dcd5dfded822815305d4330f4892.tar.gz |
removed incorrect id selector css for code view container since its breaking it.
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
-rwxr-xr-x | css/ninja.css | 8 | ||||
-rwxr-xr-x | js/stage/stage-view.reel/stage-view.css | 29 | ||||
-rw-r--r-- | scss/imports/scss/_Stage.scss | 27 |
3 files changed, 10 insertions, 54 deletions
diff --git a/css/ninja.css b/css/ninja.css index 6a804e99..cd7a35ab 100755 --- a/css/ninja.css +++ b/css/ninja.css | |||
@@ -204,14 +204,6 @@ body { position: absolute; margin: 0px; width: 100%; height: 100%; background-co | |||
204 | 204 | ||
205 | .layoutCanvas { position: absolute; margin: 0px; border: none; padding: 0px; top: 0px; left: 0px; z-index: 4; } | 205 | .layoutCanvas { position: absolute; margin: 0px; border: none; padding: 0px; top: 0px; left: 0px; z-index: 4; } |
206 | 206 | ||
207 | #codeViewContainer { position: absolute; top: 0px; left: 0px; margin: 0px; padding: 0px; background: black; width: 100%; height: 100%; display: none; } | ||
208 | |||
209 | #mainContent #codeMirror_1 { height: 100%; } | ||
210 | |||
211 | #mainContent .CodeMirror { width: 100%; height: 100%; background: white; } | ||
212 | |||
213 | #mainContent .CodeMirror-scroll { height: 100%; overflow: auto; } | ||
214 | |||
215 | .montage-editor-frame { position: absolute; z-index: 7; top: 0; left: 0; display: none; -webkit-user-select: initial; } | 207 | .montage-editor-frame { position: absolute; z-index: 7; top: 0; left: 0; display: none; -webkit-user-select: initial; } |
216 | 208 | ||
217 | .montage-editor { padding: 0px; word-wrap: normal; } | 209 | .montage-editor { padding: 0px; word-wrap: normal; } |
diff --git a/js/stage/stage-view.reel/stage-view.css b/js/stage/stage-view.reel/stage-view.css index e2c4bb0e..8afb52a2 100755 --- a/js/stage/stage-view.reel/stage-view.css +++ b/js/stage/stage-view.reel/stage-view.css | |||
@@ -17,29 +17,20 @@ | |||
17 | cursor:text; | 17 | cursor:text; |
18 | } | 18 | } |
19 | 19 | ||
20 | .codeViewContainer>div{ | 20 | .codeViewContainer .CodeMirror { |
21 | width:2500px;/*to prevent scrolling of editor container in the middle of the page for short files*/ | 21 | width: 100%; |
22 | height: 100%; | ||
23 | background: white; | ||
22 | } | 24 | } |
23 | 25 | ||
24 | /* OLD CSS for reference | 26 | .codeViewContainer .CodeMirror-scroll { |
25 | #mainContent #codeMirror_1 { | 27 | height: 100%; |
26 | height:100%; | 28 | overflow: auto; |
27 | } | 29 | } |
28 | */ | ||
29 | |||
30 | /*.CodeMirror {*/ | ||
31 | /*width: 100%;*/ | ||
32 | /*height: 100%;*/ | ||
33 | /*background: white;*/ | ||
34 | /*}*/ | ||
35 | |||
36 | /*.CodeMirror .CodeMirror-scroll {*/ | ||
37 | /*height: 100%;*/ | ||
38 | /*overflow: scroll;*/ | ||
39 | /*overflow-x: auto;*/ | ||
40 | /*overflow-y: auto;*/ | ||
41 | /*}*/ | ||
42 | 30 | ||
31 | .codeViewContainer>div{ | ||
32 | width:2500px;/*to prevent scrolling of editor container in the middle of the page for short files*/ | ||
33 | } | ||
43 | 34 | ||
44 | span.CodeMirror-matchhighlight { background: #e9e9e9 } | 35 | span.CodeMirror-matchhighlight { background: #e9e9e9 } |
45 | .CodeMirror-focused span.CodeMirror-matchhighlight { background: #e7e4ff; !important } | 36 | .CodeMirror-focused span.CodeMirror-matchhighlight { background: #e7e4ff; !important } |
diff --git a/scss/imports/scss/_Stage.scss b/scss/imports/scss/_Stage.scss index 4644e3ba..ed8d0656 100644 --- a/scss/imports/scss/_Stage.scss +++ b/scss/imports/scss/_Stage.scss | |||
@@ -164,33 +164,6 @@ | |||
164 | z-index: 4; | 164 | z-index: 4; |
165 | } | 165 | } |
166 | 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: auto; | ||
192 | } | ||
193 | |||
194 | .montage-editor-frame { | 167 | .montage-editor-frame { |
195 | position:absolute; | 168 | position:absolute; |
196 | z-index:7; | 169 | z-index:7; |