diff options
author | hwc487 | 2012-05-11 13:52:55 -0700 |
---|---|---|
committer | hwc487 | 2012-05-11 13:52:55 -0700 |
commit | 137bfc9d4c41cc918d969565bec28a834fe10472 (patch) | |
tree | e9fa109fc65218f45e386df48b713ff5858f3d62 /scss/imports | |
parent | d21aaca3d7093b6af968b7f9f764ab54e004f02b (diff) | |
parent | 27f4cacb39de1c2e3910748dadc9fc16d0655480 (diff) | |
download | ninja-137bfc9d4c41cc918d969565bec28a834fe10472.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
Conflicts:
js/lib/geom/geom-obj.js
js/lib/geom/rectangle.js
js/tools/TagTool.js
Diffstat (limited to 'scss/imports')
-rwxr-xr-x | scss/imports/scss/_MainWindow.scss | 14 | ||||
-rwxr-xr-x | scss/imports/scss/_PanelUI.scss | 1 | ||||
-rw-r--r-- | scss/imports/scss/_Stage.scss | 35 | ||||
-rwxr-xr-x | scss/imports/scss/_toolbar.scss | 1 |
4 files changed, 9 insertions, 42 deletions
diff --git a/scss/imports/scss/_MainWindow.scss b/scss/imports/scss/_MainWindow.scss index f6068ddb..2fdf0ac6 100755 --- a/scss/imports/scss/_MainWindow.scss +++ b/scss/imports/scss/_MainWindow.scss | |||
@@ -200,7 +200,7 @@ | |||
200 | background-color: #474747; | 200 | background-color: #474747; |
201 | } | 201 | } |
202 | 202 | ||
203 | #mainContainer #rulerTop { | 203 | #mainContainer .rulerTop { |
204 | display: none; | 204 | display: none; |
205 | // TODO: temporary background please replace when component is implemented | 205 | // TODO: temporary background please replace when component is implemented |
206 | background:$color-stage url('../images/temp/ruler-top.png'); | 206 | background:$color-stage url('../images/temp/ruler-top.png'); |
@@ -209,7 +209,7 @@ | |||
209 | border-right: 11px solid black; | 209 | border-right: 11px solid black; |
210 | } | 210 | } |
211 | 211 | ||
212 | #rulerLeft { | 212 | .rulerLeft { |
213 | display: none; | 213 | display: none; |
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'); |
@@ -305,12 +305,7 @@ | |||
305 | box-orient: vertical; | 305 | box-orient: vertical; |
306 | } | 306 | } |
307 | 307 | ||
308 | // TODO: REMOVE THIS | 308 | .openDocumentsTab { |
309 | #rightPanelContent { | ||
310 | overflow-y:hidden; | ||
311 | } | ||
312 | |||
313 | #openDocumentsTabComponent { | ||
314 | height: 25px; | 309 | height: 25px; |
315 | position: relative; | 310 | position: relative; |
316 | overflow: hidden; | 311 | overflow: hidden; |
@@ -343,9 +338,8 @@ | |||
343 | background-color: #7f7f7f; | 338 | background-color: #7f7f7f; |
344 | } | 339 | } |
345 | 340 | ||
346 | #documentBar { | 341 | .documentBar { |
347 | height: 25px; | 342 | height: 25px; |
348 | width: 1000px; | ||
349 | position: relative; | 343 | position: relative; |
350 | overflow: hidden; | 344 | overflow: hidden; |
351 | color: white; | 345 | color: white; |
diff --git a/scss/imports/scss/_PanelUI.scss b/scss/imports/scss/_PanelUI.scss index d60dae59..dd8cee04 100755 --- a/scss/imports/scss/_PanelUI.scss +++ b/scss/imports/scss/_PanelUI.scss | |||
@@ -1240,6 +1240,7 @@ display: -webkit-box; | |||
1240 | 1240 | ||
1241 | .rightPanelContent { | 1241 | .rightPanelContent { |
1242 | position:absolute; | 1242 | position:absolute; |
1243 | overflow-y:hidden; | ||
1243 | height:100%; | 1244 | height:100%; |
1244 | width:100%; | 1245 | width:100%; |
1245 | } | 1246 | } |
diff --git a/scss/imports/scss/_Stage.scss b/scss/imports/scss/_Stage.scss index 587903d2..ed8d0656 100644 --- a/scss/imports/scss/_Stage.scss +++ b/scss/imports/scss/_Stage.scss | |||
@@ -133,7 +133,7 @@ | |||
133 | 133 | ||
134 | } | 134 | } |
135 | 135 | ||
136 | #drawingCanvas { | 136 | .drawingCanvas { |
137 | position: absolute; | 137 | position: absolute; |
138 | margin: 0px; | 138 | margin: 0px; |
139 | border: none; | 139 | border: none; |
@@ -144,7 +144,7 @@ | |||
144 | } | 144 | } |
145 | 145 | ||
146 | 146 | ||
147 | #stageCanvas { | 147 | .stageCanvas { |
148 | position: absolute; | 148 | position: absolute; |
149 | margin: 0px; | 149 | margin: 0px; |
150 | border: none; | 150 | border: none; |
@@ -154,7 +154,7 @@ | |||
154 | z-index: 5; | 154 | z-index: 5; |
155 | } | 155 | } |
156 | 156 | ||
157 | #layoutCanvas { | 157 | .layoutCanvas { |
158 | position: absolute; | 158 | position: absolute; |
159 | margin: 0px; | 159 | margin: 0px; |
160 | border: none; | 160 | border: none; |
@@ -164,35 +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: scroll; | ||
192 | overflow-x: auto; | ||
193 | overflow-y: auto; | ||
194 | } | ||
195 | |||
196 | .montage-editor-frame { | 167 | .montage-editor-frame { |
197 | position:absolute; | 168 | position:absolute; |
198 | z-index:7; | 169 | z-index:7; |
diff --git a/scss/imports/scss/_toolbar.scss b/scss/imports/scss/_toolbar.scss index 9bf540cd..e4bf64bf 100755 --- a/scss/imports/scss/_toolbar.scss +++ b/scss/imports/scss/_toolbar.scss | |||
@@ -26,6 +26,7 @@ | |||
26 | border-top: 1px solid #232323; | 26 | border-top: 1px solid #232323; |
27 | border-bottom: 1px solid #3A3A3A; | 27 | border-bottom: 1px solid #3A3A3A; |
28 | margin:2px; | 28 | margin:2px; |
29 | width:100%; | ||
29 | } | 30 | } |
30 | 31 | ||
31 | .toolbutton { | 32 | .toolbutton { |