Merge branch 'refs/heads/NinjaInternal' into FileIO

Conflicts: js/controllers/document-controller.js
author: Jose Antonio Marquez 2012-02-23 15:11:51 -0800
committer: Jose Antonio Marquez 2012-02-23 15:11:51 -0800
commit: bdc39718cacad2eab10a7d031ea10fda13c92a03 (patch)
tree: 5fa2ae85a15d8a5067fa6f608c2b285869264ead /js/panels/Timeline/PropertyTrack.reel
parent: 23b4bbd13345ecd5c00fda60b995a7fb2aab317c (diff)
parent: 41b69af7c0be3dd5fe4f772668862696af8b917a (diff)
download: ninja-bdc39718cacad2eab10a7d031ea10fda13c92a03.tar.gz
5 files changed, 82 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..7781af11
--- /dev/null
+++ b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.html
@@ -0,0 +1,24 @@
+<!DOCTYPE html>
+<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..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
author	Jose Antonio Marquez	2012-02-23 15:11:51 -0800
committer	Jose Antonio Marquez	2012-02-23 15:11:51 -0800
commit	bdc39718cacad2eab10a7d031ea10fda13c92a03 (patch)
tree	5fa2ae85a15d8a5067fa6f608c2b285869264ead /js/panels/Timeline/PropertyTrack.reel
parent	23b4bbd13345ecd5c00fda60b995a7fb2aab317c (diff)
parent	41b69af7c0be3dd5fe4f772668862696af8b917a (diff)
download	ninja-bdc39718cacad2eab10a7d031ea10fda13c92a03.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..7781af11 --- /dev/null +++ b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.html
@@ -0,0 +1,24 @@
	1	<!DOCTYPE html>
	2	<html lang="en">
	3	<head>
	4	<meta http-equiv="content-type" content="text/html; charset=utf-8" />
	5	<link rel="stylesheet" type="text/css" href="css/PropertyTrack.css">
	6	<script type="text/montage-serialization">
	7	{
	8	"owner": {
	9	"module": "js/panels/Timeline/PropertyTrack.reel",
	10	"name": "PropertyTrack",
	11	"properties": {
	12	"element": {"#": "property-track"}
	13	}
	14	}
	15
	16	}
	17	</script>
	18	</head>
	19	<body>
	20
	21	<div id="property-track" class="timeline-track"></div>
	22
	23	</body>
	24	</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..1b0035cd --- /dev/null +++ b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js
@@ -0,0 +1,15 @@
	1	var Montage = require("montage/core/core").Montage;
	2	var Component = require("montage/ui/component").Component;
	3
	4	var PropertyTrack = exports.PropertyTrack = Montage.create(Component, {
	5
	6	hasTemplate:{
	7	value: true
	8	},
	9
	10	prepareForDraw:{
	11	value:function(){
	12
	13	}
	14	}
	15	});


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	}


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 @@
	1	/* PropertyTrack.scss
	2	* Main SCSS file for PropertyTrack component, compiled by SASS into the file css/PropertyTrack.css.
	3	*/
	4
	5	// Import theme settings
	6	@import "../../../../../scss/imports/themes/default/colors";
	7	@import "../../../../../scss/imports/themes/default/mixins";
	8
	9	// Import generic mixins and styles
	10	@import "../../../../../scss/imports/scss/mixins";
	11
	12
	13	.content-main .collapsible-content .timeline-track {
	14	height: 20px;
	15	border-bottom: 1px solid $color-menu-divider;
	16	}
	17
	18
	19	.timeline-track .content-main {
	20	background-color: $color-menu-bg;
	21	}


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