diff options
author | Eric Guzman | 2012-02-08 16:53:46 -0800 |
---|---|---|
committer | Eric Guzman | 2012-02-08 16:53:46 -0800 |
commit | 600dc32b7fbf406443e067eb661758e478049170 (patch) | |
tree | 1cb5b8cfa861460e73d95f8ef275e20ad904e6ea /js | |
parent | 4ab650bccc776b031191dc410a93309a9d342bab (diff) | |
download | ninja-600dc32b7fbf406443e067eb661758e478049170.tar.gz |
Presets - fixed some object naming and css for presets tree
Diffstat (limited to 'js')
-rw-r--r-- | js/panels/presets/content.reel/content.css | 3 | ||||
-rw-r--r-- | js/panels/presets/style-presets.reel/style-presets.html | 6 |
2 files changed, 3 insertions, 6 deletions
diff --git a/js/panels/presets/content.reel/content.css b/js/panels/presets/content.reel/content.css index a6a1545f..d0c8a08a 100644 --- a/js/panels/presets/content.reel/content.css +++ b/js/panels/presets/content.reel/content.css | |||
@@ -47,9 +47,6 @@ | |||
47 | -webkit-box-flex: 1; | 47 | -webkit-box-flex: 1; |
48 | overflow: auto; | 48 | overflow: auto; |
49 | background-color: #474747; | 49 | background-color: #474747; |
50 | |||
51 | color: #FFF; | ||
52 | |||
53 | position: relative; | 50 | position: relative; |
54 | z-index: 1000; | 51 | z-index: 1000; |
55 | } \ No newline at end of file | 52 | } \ No newline at end of file |
diff --git a/js/panels/presets/style-presets.reel/style-presets.html b/js/panels/presets/style-presets.reel/style-presets.html index 5bc83ffa..58af617f 100644 --- a/js/panels/presets/style-presets.reel/style-presets.html +++ b/js/panels/presets/style-presets.reel/style-presets.html | |||
@@ -38,14 +38,14 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
38 | "name" : "Treeview", | 38 | "name" : "Treeview", |
39 | "properties" : { | 39 | "properties" : { |
40 | "element" : {"#": "libraryContainer"}, | 40 | "element" : {"#": "libraryContainer"}, |
41 | "branchComponent" : {"@": "njbranch" }, | 41 | "branchComponent" : {"@": "branch" }, |
42 | "contentController": {"@": "presetsController"}, | 42 | "contentController": {"@": "presetsController"}, |
43 | "showRoot" : false | 43 | "showRoot" : false |
44 | } | 44 | } |
45 | }, | 45 | }, |
46 | "njbranch" : { | 46 | "branch" : { |
47 | "module" : "js/components/treeview/ninja-branch.reel", | 47 | "module" : "js/components/treeview/ninja-branch.reel", |
48 | "name" : "NinjaBranch" | 48 | "name" : "Branch" |
49 | } | 49 | } |
50 | } | 50 | } |
51 | </script> | 51 | </script> |