From cf671b4855ecca0278128e82459691292a3d3dc9 Mon Sep 17 00:00:00 2001 From: Jonathan Duran Date: Thu, 23 Feb 2012 08:08:30 -0800 Subject: Timeline: Create new PropertyTrack subcomponent, and use it in the TimelineTrack component. Cherry pick commit from jreid/Timeline-jreid Signed-off-by: Jonathan Duran --- .../Timeline/PropertyTrack.reel/PropertyTrack.html | 24 ++++++++++++++++++++++ .../Timeline/PropertyTrack.reel/PropertyTrack.js | 15 ++++++++++++++ .../PropertyTrack.reel/css/PropertyTrack.css | 13 ++++++++++++ .../PropertyTrack.reel/scss/PropertyTrack.scss | 21 +++++++++++++++++++ .../Timeline/PropertyTrack.reel/scss/config.rb | 9 ++++++++ 5 files changed, 82 insertions(+) create mode 100644 js/panels/Timeline/PropertyTrack.reel/PropertyTrack.html create mode 100644 js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js create mode 100644 js/panels/Timeline/PropertyTrack.reel/css/PropertyTrack.css create mode 100644 js/panels/Timeline/PropertyTrack.reel/scss/PropertyTrack.scss create mode 100644 js/panels/Timeline/PropertyTrack.reel/scss/config.rb (limited to 'js/panels/Timeline/PropertyTrack.reel') diff --git a/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.html b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.html new file mode 100644 index 00000000..7781af11 --- /dev/null +++ b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.html @@ -0,0 +1,24 @@ + + + + + + + + + +

+ + + \ No newline at end of file diff --git a/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js new file mode 100644 index 00000000..1b0035cd --- /dev/null +++ b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js @@ -0,0 +1,15 @@ +var Montage = require("montage/core/core").Montage; +var Component = require("montage/ui/component").Component; + +var PropertyTrack = exports.PropertyTrack = Montage.create(Component, { + + hasTemplate:{ + value: true + }, + + prepareForDraw:{ + value:function(){ + + } + } +}); 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 @@ +/* PropertyTrack.scss + * Main SCSS file for PropertyTrack component, compiled by SASS into the file css/PropertyTrack.css. + */ +/* line 13, ../scss/PropertyTrack.scss */ +.content-main .collapsible-content .timeline-track { + height: 20px; + border-bottom: 1px solid #505050; +} + +/* line 19, ../scss/PropertyTrack.scss */ +.timeline-track .content-main { + background-color: #474747; +} diff --git a/js/panels/Timeline/PropertyTrack.reel/scss/PropertyTrack.scss b/js/panels/Timeline/PropertyTrack.reel/scss/PropertyTrack.scss new file mode 100644 index 00000000..ef8e1ec2 --- /dev/null +++ b/js/panels/Timeline/PropertyTrack.reel/scss/PropertyTrack.scss @@ -0,0 +1,21 @@ +/* PropertyTrack.scss + * Main SCSS file for PropertyTrack component, compiled by SASS into the file css/PropertyTrack.css. + */ + +// Import theme settings +@import "../../../../../scss/imports/themes/default/colors"; +@import "../../../../../scss/imports/themes/default/mixins"; + +// Import generic mixins and styles +@import "../../../../../scss/imports/scss/mixins"; + + +.content-main .collapsible-content .timeline-track { + height: 20px; + border-bottom: 1px solid $color-menu-divider; + } + + +.timeline-track .content-main { + background-color: $color-menu-bg; +} diff --git a/js/panels/Timeline/PropertyTrack.reel/scss/config.rb b/js/panels/Timeline/PropertyTrack.reel/scss/config.rb new file mode 100644 index 00000000..e5a99b70 --- /dev/null +++ b/js/panels/Timeline/PropertyTrack.reel/scss/config.rb @@ -0,0 +1,9 @@ +# Require any additional compass plugins here. +# Set this to the root of your project when deployed: +http_path = "/" +css_dir = "../css" +sass_dir = "" +images_dir = "../images/" +javascripts_dir = "../js" +# To enable relative paths to assets via compass helper functions. Uncomment: +# relative_assets = true -- cgit v1.2.3 From 5de5dc6454fe6ca097ce4baf34768c9174a827d9 Mon Sep 17 00:00:00 2001 From: Valerio Virgillito Date: Fri, 24 Feb 2012 10:20:04 -0800 Subject: Adding some missing copyrights Signed-off-by: Valerio Virgillito --- js/panels/Timeline/PropertyTrack.reel/PropertyTrack.html | 5 +++++ js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js | 6 ++++++ js/panels/Timeline/PropertyTrack.reel/css/PropertyTrack.css | 6 ++++++ js/panels/Timeline/PropertyTrack.reel/scss/PropertyTrack.scss | 6 ++++++ 4 files changed, 23 insertions(+) (limited to 'js/panels/Timeline/PropertyTrack.reel') diff --git a/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.html b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.html index 7781af11..01cad6cb 100644 --- a/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.html +++ b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.html @@ -1,4 +1,9 @@ + diff --git a/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js index 1b0035cd..175b77f9 100644 --- a/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js +++ b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js @@ -1,3 +1,9 @@ +/* + This file contains proprietary software owned by Motorola Mobility, Inc.
+ No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.
+ (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. + */ + var Montage = require("montage/core/core").Montage; var Component = require("montage/ui/component").Component; diff --git a/js/panels/Timeline/PropertyTrack.reel/css/PropertyTrack.css b/js/panels/Timeline/PropertyTrack.reel/css/PropertyTrack.css index 9c27e705..8e45305a 100644 --- a/js/panels/Timeline/PropertyTrack.reel/css/PropertyTrack.css +++ b/js/panels/Timeline/PropertyTrack.reel/css/PropertyTrack.css @@ -1,3 +1,9 @@ +/* + This file contains proprietary software owned by Motorola Mobility, Inc.
+ No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.
+ (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. + */ + /* PropertyTrack.scss * Main SCSS file for PropertyTrack component, compiled by SASS into the file css/PropertyTrack.css. */ diff --git a/js/panels/Timeline/PropertyTrack.reel/scss/PropertyTrack.scss b/js/panels/Timeline/PropertyTrack.reel/scss/PropertyTrack.scss index ef8e1ec2..273e3d77 100644 --- a/js/panels/Timeline/PropertyTrack.reel/scss/PropertyTrack.scss +++ b/js/panels/Timeline/PropertyTrack.reel/scss/PropertyTrack.scss @@ -1,3 +1,9 @@ +/* + This file contains proprietary software owned by Motorola Mobility, Inc.
+ No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.
+ (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. + */ + /* PropertyTrack.scss * Main SCSS file for PropertyTrack component, compiled by SASS into the file css/PropertyTrack.css. */ -- cgit v1.2.3