aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/TimelineTrack.reel/scss/TimelineTrack.scss
diff options
context:
space:
mode:
authorhwc4872012-02-23 15:21:56 -0800
committerhwc4872012-02-23 15:21:56 -0800
commit26bb2894c29d4608e843de01829d352dd3d00823 (patch)
treec5a9d10976304fe5b3dec59f40977d8c72df57de /js/panels/Timeline/TimelineTrack.reel/scss/TimelineTrack.scss
parent64280907f31e6f6e5659acb0893df3e0da5bb044 (diff)
parent81ce79819ba574b03b46e91e9a153dab82b550cd (diff)
downloadninja-26bb2894c29d4608e843de01829d352dd3d00823.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into integration
Conflicts: js/helper-classes/RDGE/GLWorld.js js/helper-classes/RDGE/Materials/PulseMaterial.js js/helper-classes/RDGE/Materials/RadialBlurMaterial.js js/helper-classes/RDGE/src/tools/rdge-compiled.js js/preloader/Preloader.js
Diffstat (limited to 'js/panels/Timeline/TimelineTrack.reel/scss/TimelineTrack.scss')
-rw-r--r--js/panels/Timeline/TimelineTrack.reel/scss/TimelineTrack.scss14
1 files changed, 6 insertions, 8 deletions
diff --git a/js/panels/Timeline/TimelineTrack.reel/scss/TimelineTrack.scss b/js/panels/Timeline/TimelineTrack.reel/scss/TimelineTrack.scss
index c492d18d..43d5f438 100644
--- a/js/panels/Timeline/TimelineTrack.reel/scss/TimelineTrack.scss
+++ b/js/panels/Timeline/TimelineTrack.reel/scss/TimelineTrack.scss
@@ -5,13 +5,13 @@
5 */ 5 */
6 6
7// Import theme settings 7// Import theme settings
8@import "../../../../../_scss/imports/themes/default/colors"; 8@import "../../../../../scss/imports/themes/default/colors";
9// @import "../../../../../_scss/imports/themes/default/fonts"; 9// @import "../../../../../scss/imports/themes/default/fonts";
10@import "../../../../../_scss/imports/themes/default/mixins"; 10@import "../../../../../scss/imports/themes/default/mixins";
11 11
12// Import generic mixins and styles 12// Import generic mixins and styles
13@import "../../../../../_scss/imports/scss/mixins"; 13@import "../../../../../scss/imports/scss/mixins";
14// @import "../../../../../_scss/imports/scss/Base"; 14// @import "../../../../../scss/imports/scss/Base";
15 15
16.tracklane{ 16.tracklane{
17 height: 19px; 17 height: 19px;
@@ -60,6 +60,4 @@
60 color: $color-panel-text; 60 color: $color-panel-text;
61 61
62} 62}
63 .tl_layertracks .collapsible-content .timeline-track { 63
64 height: 21px;
65 }