Merge branch 'pentool' into brushtool

Conflicts: imports/codemirror/mode/scheme/scheme.js js/tools/BrushTool.js
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/PropertyTrack.reel
parent: fcb12cc09eb3cd3b42bd215877ba18f449275b75 (diff)
parent: 053fc63a2950c7a5ee4ebf98033b64d474a3c46e (diff)
download: ninja-03ca7a5ed13c25faaa9100bb666e062fd15335e6.tar.gz
5 files changed, 105 insertions, 0 deletions
diff --git a/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.html b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.html
new file mode 100644
index 00000000..01cad6cb
--- /dev/null
+++ b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.html
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<!-- <copyright>
+ This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
+ No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
+ (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
+ </copyright> -->
+<html lang="en">
+        <head>
+        <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+        <link rel="stylesheet" type="text/css" href="css/PropertyTrack.css">
+        <script type="text/montage-serialization">
+                    {
+                        "owner": {
+                            "module": "js/panels/Timeline/PropertyTrack.reel",
+                            "name": "PropertyTrack",
+                            "properties": {
+                                "element": {"#": "property-track"}
+                            }
+                        }
+                    }
+        </script>
+        </head>
+        <body>
+                <div id="property-track" class="timeline-track"></div>
+    </body>
+</html>
+\ 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..175b77f9
--- /dev/null
+++ b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js
@@ -0,0 +1,21 @@
+/* <copyright>
+ This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
+ No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
+ (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
+ </copyright> */
+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..8e45305a
--- /dev/null
+++ b/js/panels/Timeline/PropertyTrack.reel/css/PropertyTrack.css
@@ -0,0 +1,19 @@
+/* <copyright>
+ This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
+ No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
+ (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
+ </copyright> */
+/* 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..273e3d77
--- /dev/null
+++ b/js/panels/Timeline/PropertyTrack.reel/scss/PropertyTrack.scss
@@ -0,0 +1,27 @@
+/* <copyright>
+ This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
+ No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
+ (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
+ </copyright> */
+/* 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
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/PropertyTrack.reel
parent	fcb12cc09eb3cd3b42bd215877ba18f449275b75 (diff)
parent	053fc63a2950c7a5ee4ebf98033b64d474a3c46e (diff)
download	ninja-03ca7a5ed13c25faaa9100bb666e062fd15335e6.tar.gz

diff --git a/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.html b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.html new file mode 100644 index 00000000..01cad6cb --- /dev/null +++ b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.html
@@ -0,0 +1,29 @@
	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> -->
	7	<html lang="en">
	8	<head>
	9	<meta http-equiv="content-type" content="text/html; charset=utf-8" />
	10	<link rel="stylesheet" type="text/css" href="css/PropertyTrack.css">
	11	<script type="text/montage-serialization">
	12	{
	13	"owner": {
	14	"module": "js/panels/Timeline/PropertyTrack.reel",
	15	"name": "PropertyTrack",
	16	"properties": {
	17	"element": {"#": "property-track"}
	18	}
	19	}
	20
	21	}
	22	</script>
	23	</head>
	24	<body>
	25
	26	<div id="property-track" class="timeline-track"></div>
	27
	28	</body>
	29	</html> \ 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..175b77f9 --- /dev/null +++ b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js
@@ -0,0 +1,21 @@
	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
	7	var Montage = require("montage/core/core").Montage;
	8	var Component = require("montage/ui/component").Component;
	9
	10	var PropertyTrack = exports.PropertyTrack = Montage.create(Component, {
	11
	12	hasTemplate:{
	13	value: true
	14	},
	15
	16	prepareForDraw:{
	17	value:function(){
	18
	19	}
	20	}
	21	});


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..8e45305a --- /dev/null +++ b/js/panels/Timeline/PropertyTrack.reel/css/PropertyTrack.css
@@ -0,0 +1,19 @@
	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
	7	/* PropertyTrack.scss
	8	* Main SCSS file for PropertyTrack component, compiled by SASS into the file css/PropertyTrack.css.
	9	*/
	10	/* line 13, ../scss/PropertyTrack.scss */
	11	.content-main .collapsible-content .timeline-track {
	12	height: 20px;
	13	border-bottom: 1px solid #505050;
	14	}
	15
	16	/* line 19, ../scss/PropertyTrack.scss */
	17	.timeline-track .content-main {
	18	background-color: #474747;
	19	}


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..273e3d77 --- /dev/null +++ b/js/panels/Timeline/PropertyTrack.reel/scss/PropertyTrack.scss
@@ -0,0 +1,27 @@
	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
	7	/* PropertyTrack.scss
	8	* Main SCSS file for PropertyTrack component, compiled by SASS into the file css/PropertyTrack.css.
	9	*/
	10
	11	// Import theme settings
	12	@import "../../../../../scss/imports/themes/default/colors";
	13	@import "../../../../../scss/imports/themes/default/mixins";
	14
	15	// Import generic mixins and styles
	16	@import "../../../../../scss/imports/scss/mixins";
	17
	18
	19	.content-main .collapsible-content .timeline-track {
	20	height: 20px;
	21	border-bottom: 1px solid $color-menu-divider;
	22	}
	23
	24
	25	.timeline-track .content-main {
	26	background-color: $color-menu-bg;
	27	}


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 @@
	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