aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Duran2012-05-10 10:44:18 -0700
committerJonathan Duran2012-05-10 10:44:18 -0700
commit48a0d3a091602d4d04b0b529b780261f0d2ebc1d (patch)
tree5225336ae44fc2c50fe20ce7ed7999c35a596876
parentb42e5dc5922fb427b9edc7af60e9fa4a5dfcbe0e (diff)
downloadninja-48a0d3a091602d4d04b0b529b780261f0d2ebc1d.tar.gz
Timeline: Bug fix: tweens now hide when their container collapses.
Signed-off-by: Jonathan Duran <jduran@motorola.com>
Diffstat
-rw-r--r--js/panels/Timeline/Layer.reel/css/Layer.css33
-rw-r--r--js/panels/Timeline/Layer.reel/scss/Layer.scss3
-rw-r--r--js/panels/Timeline/PropertyTrack.reel/PropertyTrack.html2
3 files changed, 23 insertions, 15 deletions
diff --git a/js/panels/Timeline/Layer.reel/css/Layer.css b/js/panels/Timeline/Layer.reel/css/Layer.css
index 179571af..3648fda5 100644
--- a/js/panels/Timeline/Layer.reel/css/Layer.css
+++ b/js/panels/Timeline/Layer.reel/css/Layer.css
@@ -224,22 +224,27 @@
224} 224}
225 225
226/* line 199, ../scss/Layer.scss */ 226/* line 199, ../scss/Layer.scss */
227.timeline-track .collapsible-content {
228 position: relative;
229}
230
231/* line 202, ../scss/Layer.scss */
227.collapsible-content .layout-table { 232.collapsible-content .layout-table {
228 width: 99.9%; 233 width: 99.9%;
229} 234}
230 235
231/* line 202, ../scss/Layer.scss */ 236/* line 205, ../scss/Layer.scss */
232.content-layer .collapsible-content { 237.content-layer .collapsible-content {
233 padding-left: 30px; 238 padding-left: 30px;
234} 239}
235 240
236/* line 205, ../scss/Layer.scss */ 241/* line 208, ../scss/Layer.scss */
237.collapsible-content .collapsible-content .layout-table .layout-row { 242.collapsible-content .collapsible-content .layout-table .layout-row {
238 height: 20px; 243 height: 20px;
239 overflow: hidden; 244 overflow: hidden;
240} 245}
241 246
242/* line 209, ../scss/Layer.scss */ 247/* line 212, ../scss/Layer.scss */
243.collapsible-content .collapsible-content .layout-table .layout-row .layout-cell { 248.collapsible-content .collapsible-content .layout-table .layout-row .layout-cell {
244 width: 40%; 249 width: 40%;
245 height: 20px; 250 height: 20px;
@@ -249,13 +254,13 @@
249 overflow: hidden; 254 overflow: hidden;
250} 255}
251 256
252/* line 218, ../scss/Layer.scss */ 257/* line 221, ../scss/Layer.scss */
253.collapsible-content .collapsible-content .container-row { 258.collapsible-content .collapsible-content .container-row {
254 border-bottom: 1px solid #505050; 259 border-bottom: 1px solid #505050;
255 height: 20px; 260 height: 20px;
256} 261}
257 262
258/* line 224, ../scss/Layer.scss */ 263/* line 227, ../scss/Layer.scss */
259.collapsible-content .collapsible-content .cell-property, 264.collapsible-content .collapsible-content .cell-property,
260.collapsible-content .collapsible-content .cell-value { 265.collapsible-content .collapsible-content .cell-value {
261 width: 45%; 266 width: 45%;
@@ -267,24 +272,24 @@
267 line-height: 18px; 272 line-height: 18px;
268} 273}
269 274
270/* line 236, ../scss/Layer.scss */ 275/* line 239, ../scss/Layer.scss */
271.collapsible-content .layout-table:first-child { 276.collapsible-content .layout-table:first-child {
272 border-top: 1px solid #505050; 277 border-top: 1px solid #505050;
273} 278}
274 279
275/* line 240, ../scss/Layer.scss */ 280/* line 243, ../scss/Layer.scss */
276.collapsible-content .hottextunit { 281.collapsible-content .hottextunit {
277 width: auto; 282 width: auto;
278} 283}
279 284
280/* line 243, ../scss/Layer.scss */ 285/* line 246, ../scss/Layer.scss */
281.collapsible-transition { 286.collapsible-transition {
282 -webkit-transition-property: height; 287 -webkit-transition-property: height;
283 -webkit-transition-duration: 200ms; 288 -webkit-transition-duration: 200ms;
284 -webkit-transition-timing-function: ease-in; 289 -webkit-transition-timing-function: ease-in;
285} 290}
286 291
287/* line 251, ../scss/Layer.scss */ 292/* line 254, ../scss/Layer.scss */
288.editable2 { 293.editable2 {
289 height: 20px; 294 height: 20px;
290 background-color: #242424 !important; 295 background-color: #242424 !important;
@@ -296,29 +301,29 @@
296 text-overflow: clip; 301 text-overflow: clip;
297} 302}
298 303
299/* line 261, ../scss/Layer.scss */ 304/* line 264, ../scss/Layer.scss */
300.editable2 br { 305.editable2 br {
301 display: inline; 306 display: inline;
302} 307}
303 308
304/* line 265, ../scss/Layer.scss */ 309/* line 268, ../scss/Layer.scss */
305.label-style .disabled { 310.label-style .disabled {
306 cursor: default; 311 cursor: default;
307} 312}
308 313
309/* styles elements */ 314/* styles elements */
310/* line 270, ../scss/Layer.scss */ 315/* line 273, ../scss/Layer.scss */
311.content-style .item-template { 316.content-style .item-template {
312 display: none; 317 display: none;
313} 318}
314 319
315/* line 273, ../scss/Layer.scss */ 320/* line 276, ../scss/Layer.scss */
316.content-style .layout-row.selected .layout-cell { 321.content-style .layout-row.selected .layout-cell {
317 background-color: #b2b2b2; 322 background-color: #b2b2b2;
318 color: #242424; 323 color: #242424;
319} 324}
320 325
321/* line 277, ../scss/Layer.scss */ 326/* line 280, ../scss/Layer.scss */
322.style-row { 327.style-row {
323 height: 20px; 328 height: 20px;
324} 329}
diff --git a/js/panels/Timeline/Layer.reel/scss/Layer.scss b/js/panels/Timeline/Layer.reel/scss/Layer.scss
index 8e5e50db..a407c9dc 100644
--- a/js/panels/Timeline/Layer.reel/scss/Layer.scss
+++ b/js/panels/Timeline/Layer.reel/scss/Layer.scss
@@ -196,6 +196,9 @@
196 top: 3px; 196 top: 3px;
197 right: 31px; 197 right: 31px;
198} 198}
199.timeline-track .collapsible-content {
200 position: relative;
201}
199.collapsible-content .layout-table { 202.collapsible-content .layout-table {
200 width: 99.9%; 203 width: 99.9%;
201} 204}
diff --git a/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.html b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.html
index 40834466..9c4160c8 100644
--- a/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.html
+++ b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.html
@@ -53,7 +53,7 @@
53 <body> 53 <body>
54 54
55 <div data-montage-id="property-track" class="timeline-track"> 55 <div data-montage-id="property-track" class="timeline-track">
56 <div data-montage-id="prop_track_lanes" class="prop-track collapsible-content collapsible-collapsed"> 56 <div data-montage-id="prop_track_lanes" class="prop-track">
57 <div data-montage-id="prop_track_lane"></div> 57 <div data-montage-id="prop_track_lane"></div>
58 </div> 58 </div>
59 </div> 59 </div>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 18:29:13 +0000