aboutsummaryrefslogtreecommitdiff
path: root/js/components
diff options
context:
space:
mode:
authorNivesh Rajbhandari2012-02-03 11:21:09 -0800
committerNivesh Rajbhandari2012-02-03 11:21:09 -0800
commitc203ea7413b5a2b2232d7f8346cd1b9932f2575b (patch)
tree866f72ecc4af2f4a28b5f948ee9b03af2d32fce0 /js/components
parentdb73f720b692d63b55f7c773579fe23336ec0486 (diff)
parentc630ead20487c3948fa36448d3e7d5f7b5cba782 (diff)
downloadninja-c203ea7413b5a2b2232d7f8346cd1b9932f2575b.tar.gz
Merge branch 'refs/heads/master' into ToolFixes
Diffstat (limited to 'js/components')
-rw-r--r--js/components/layout/bread-crumb.reel/bread-crumb.css1
-rw-r--r--js/components/tree.reel/tree.js2
2 files changed, 2 insertions, 1 deletions
diff --git a/js/components/layout/bread-crumb.reel/bread-crumb.css b/js/components/layout/bread-crumb.reel/bread-crumb.css
index f84c6e80..cc984609 100644
--- a/js/components/layout/bread-crumb.reel/bread-crumb.css
+++ b/js/components/layout/bread-crumb.reel/bread-crumb.css
@@ -5,6 +5,7 @@
5 </copyright> */ 5 </copyright> */
6 6
7.bread_crumb{ 7.bread_crumb{
8 background-color: #282828;
8 border-style: double; 9 border-style: double;
9 height: 26px; 10 height: 26px;
10} 11}
diff --git a/js/components/tree.reel/tree.js b/js/components/tree.reel/tree.js
index 9c1b07e4..7084ba99 100644
--- a/js/components/tree.reel/tree.js
+++ b/js/components/tree.reel/tree.js
@@ -6,7 +6,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
6 6
7var Montage = require("montage/core/core").Montage; 7var Montage = require("montage/core/core").Montage;
8var Component = require("montage/ui/component").Component; 8var Component = require("montage/ui/component").Component;
9var nj = require("js/lib/NJUtils.js").NJUtils; 9var nj = require("js/lib/NJUtils").NJUtils;
10 10
11exports.Tree = Montage.create(Component, { 11exports.Tree = Montage.create(Component, {
12 12