aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/TrackSpacer.reel
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-02-24 14:51:58 -0800
committerJose Antonio Marquez2012-02-24 14:51:58 -0800
commitc916a2a5fec0c96bd1c6f56af82543da9b69c33c (patch)
treee2219c6fcc7dc3e4168a3c7aad3829a1c954821b /js/panels/Timeline/TrackSpacer.reel
parent9a87513929290b6f84a090b4b4cca8fab0f2ab81 (diff)
parent8125c8c6c9431067840d81c46624b6a2dd5eb4a7 (diff)
downloadninja-c916a2a5fec0c96bd1c6f56af82543da9b69c33c.tar.gz
Merge branch 'refs/heads/NinjaInternal' into FileIO
Diffstat (limited to 'js/panels/Timeline/TrackSpacer.reel')
-rw-r--r--js/panels/Timeline/TrackSpacer.reel/TrackSpacer.html5
-rw-r--r--js/panels/Timeline/TrackSpacer.reel/TrackSpacer.js6
-rw-r--r--js/panels/Timeline/TrackSpacer.reel/css/TrackSpacer.css6
3 files changed, 17 insertions, 0 deletions
diff --git a/js/panels/Timeline/TrackSpacer.reel/TrackSpacer.html b/js/panels/Timeline/TrackSpacer.reel/TrackSpacer.html
index e6494d79..94f5c278 100644
--- a/js/panels/Timeline/TrackSpacer.reel/TrackSpacer.html
+++ b/js/panels/Timeline/TrackSpacer.reel/TrackSpacer.html
@@ -1,4 +1,9 @@
1<!DOCTYPE html> 1<!DOCTYPE html>
2<!-- <copyright>
3 This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
4 No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
5 (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.
6 </copyright> -->
2<html lang="en"> 7<html lang="en">
3 <head> 8 <head>
4 <meta http-equiv="content-type" content="text/html; charset=utf-8" /> 9 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
diff --git a/js/panels/Timeline/TrackSpacer.reel/TrackSpacer.js b/js/panels/Timeline/TrackSpacer.reel/TrackSpacer.js
index b3b8133a..f1b5407a 100644
--- a/js/panels/Timeline/TrackSpacer.reel/TrackSpacer.js
+++ b/js/panels/Timeline/TrackSpacer.reel/TrackSpacer.js
@@ -1,3 +1,9 @@
1/* <copyright>
2 This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
3 No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
4 (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.
5 </copyright> */
6
1var Montage = require("montage/core/core").Montage; 7var Montage = require("montage/core/core").Montage;
2var Component = require("montage/ui/component").Component; 8var Component = require("montage/ui/component").Component;
3 9
diff --git a/js/panels/Timeline/TrackSpacer.reel/css/TrackSpacer.css b/js/panels/Timeline/TrackSpacer.reel/css/TrackSpacer.css
index 7a571fe8..b98b555d 100644
--- a/js/panels/Timeline/TrackSpacer.reel/css/TrackSpacer.css
+++ b/js/panels/Timeline/TrackSpacer.reel/css/TrackSpacer.css
@@ -1,3 +1,9 @@
1/* <copyright>
2 This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
3 No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
4 (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.
5 </copyright> */
6
1.trackspacer{ 7.trackspacer{
2 height:22px; 8 height:22px;
3 width: 100%; 9 width: 100%;