aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/PropertyTrack.reel/css
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/PropertyTrack.reel/css
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/PropertyTrack.reel/css')
-rw-r--r--js/panels/Timeline/PropertyTrack.reel/css/PropertyTrack.css13
1 files changed, 13 insertions, 0 deletions
diff --git a/js/panels/Timeline/PropertyTrack.reel/css/PropertyTrack.css b/js/panels/Timeline/PropertyTrack.reel/css/PropertyTrack.css
new file mode 100644
index 00000000..9c27e705
--- /dev/null
+++ b/js/panels/Timeline/PropertyTrack.reel/css/PropertyTrack.css
@@ -0,0 +1,13 @@
1/* PropertyTrack.scss
2 * Main SCSS file for PropertyTrack component, compiled by SASS into the file css/PropertyTrack.css.
3 */
4/* line 13, ../scss/PropertyTrack.scss */
5.content-main .collapsible-content .timeline-track {
6 height: 20px;
7 border-bottom: 1px solid #505050;
8}
9
10/* line 19, ../scss/PropertyTrack.scss */
11.timeline-track .content-main {
12 background-color: #474747;
13}