aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/TimelineTrack.reel/scss
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-02-23 15:11:51 -0800
committerJose Antonio Marquez2012-02-23 15:11:51 -0800
commitbdc39718cacad2eab10a7d031ea10fda13c92a03 (patch)
tree5fa2ae85a15d8a5067fa6f608c2b285869264ead /js/panels/Timeline/TimelineTrack.reel/scss
parent23b4bbd13345ecd5c00fda60b995a7fb2aab317c (diff)
parent41b69af7c0be3dd5fe4f772668862696af8b917a (diff)
downloadninja-bdc39718cacad2eab10a7d031ea10fda13c92a03.tar.gz
Merge branch 'refs/heads/NinjaInternal' into FileIO
Conflicts: js/controllers/document-controller.js
Diffstat (limited to 'js/panels/Timeline/TimelineTrack.reel/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 }