diff options
author | Pushkar Joshi | 2012-02-24 12:08:49 -0800 |
---|---|---|
committer | Pushkar Joshi | 2012-02-24 12:08:49 -0800 |
commit | 03ca7a5ed13c25faaa9100bb666e062fd15335e6 (patch) | |
tree | c51112223ceb9121cd595a60335eb2795215590f /js/panels/Timeline/TimelineTrack.reel/scss | |
parent | fcb12cc09eb3cd3b42bd215877ba18f449275b75 (diff) | |
parent | 053fc63a2950c7a5ee4ebf98033b64d474a3c46e (diff) | |
download | ninja-03ca7a5ed13c25faaa9100bb666e062fd15335e6.tar.gz |
Merge branch 'pentool' into brushtool
Conflicts:
imports/codemirror/mode/scheme/scheme.js
js/tools/BrushTool.js
Diffstat (limited to 'js/panels/Timeline/TimelineTrack.reel/scss')
-rw-r--r-- | js/panels/Timeline/TimelineTrack.reel/scss/TimelineTrack.scss | 69 | ||||
-rw-r--r-- | js/panels/Timeline/TimelineTrack.reel/scss/config.rb | 9 |
2 files changed, 78 insertions, 0 deletions
diff --git a/js/panels/Timeline/TimelineTrack.reel/scss/TimelineTrack.scss b/js/panels/Timeline/TimelineTrack.reel/scss/TimelineTrack.scss new file mode 100644 index 00000000..1b025c74 --- /dev/null +++ b/js/panels/Timeline/TimelineTrack.reel/scss/TimelineTrack.scss | |||
@@ -0,0 +1,69 @@ | |||
1 | @charset "UTF-8"; | ||
2 | |||
3 | /* <copyright> | ||
4 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | ||
5 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> | ||
6 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | ||
7 | </copyright> */ | ||
8 | |||
9 | /* TimelineTrack.scss | ||
10 | * Main SCSS file for TimelineTrack component, compiled by SASS into the file css/TimelineTrack.css. | ||
11 | */ | ||
12 | |||
13 | // Import theme settings | ||
14 | @import "../../../../../scss/imports/themes/default/colors"; | ||
15 | // @import "../../../../../scss/imports/themes/default/fonts"; | ||
16 | @import "../../../../../scss/imports/themes/default/mixins"; | ||
17 | |||
18 | // Import generic mixins and styles | ||
19 | @import "../../../../../scss/imports/scss/mixins"; | ||
20 | // @import "../../../../../scss/imports/scss/Base"; | ||
21 | |||
22 | .tracklane{ | ||
23 | height: 19px; | ||
24 | width: 100%; | ||
25 | color: white; | ||
26 | padding-top: 2px; | ||
27 | border-bottom: #444; | ||
28 | border-bottom-style: solid; | ||
29 | border-bottom-width: thin; | ||
30 | background-image: url("../images/gridline.jpg"); | ||
31 | overflow: hidden; | ||
32 | } | ||
33 | |||
34 | .keyframe{ | ||
35 | position: absolute; | ||
36 | height: 16px; | ||
37 | width: 4px; | ||
38 | background-color: white; | ||
39 | |||
40 | } | ||
41 | |||
42 | .defaultSpan{ | ||
43 | position: absolute; | ||
44 | height: 16px; | ||
45 | opacity: 0.3; | ||
46 | background-color: white; | ||
47 | } | ||
48 | |||
49 | |||
50 | |||
51 | .tl_layertracks .content-position { | ||
52 | height: 63px; | ||
53 | } | ||
54 | .tl_layertracks .content-transform { | ||
55 | height: 106px; | ||
56 | } | ||
57 | |||
58 | .tl_layertracks .collapsible-content.collapsible-collapsed { | ||
59 | overflow: hidden; | ||
60 | height: 0px; | ||
61 | } | ||
62 | |||
63 | .tl_layertracks .collapsible-content .collapsible-label { | ||
64 | height: 21px; | ||
65 | background-color: $color-panel-bg; | ||
66 | color: $color-panel-text; | ||
67 | |||
68 | } | ||
69 | |||
diff --git a/js/panels/Timeline/TimelineTrack.reel/scss/config.rb b/js/panels/Timeline/TimelineTrack.reel/scss/config.rb new file mode 100644 index 00000000..e5a99b70 --- /dev/null +++ b/js/panels/Timeline/TimelineTrack.reel/scss/config.rb | |||
@@ -0,0 +1,9 @@ | |||
1 | # Require any additional compass plugins here. | ||
2 | # Set this to the root of your project when deployed: | ||
3 | http_path = "/" | ||
4 | css_dir = "../css" | ||
5 | sass_dir = "" | ||
6 | images_dir = "../images/" | ||
7 | javascripts_dir = "../js" | ||
8 | # To enable relative paths to assets via compass helper functions. Uncomment: | ||
9 | # relative_assets = true | ||