diff options
| author | Jon Reid | 2012-06-20 15:05:26 -0700 |
|---|---|---|
| committer | Jon Reid | 2012-06-20 15:05:26 -0700 |
| commit | 6e6c146f6e59c3942076b5d2f46b2962cc709926 (patch) | |
| tree | aa6becc1e97aecbe6fb43aa33770def3c3de227d /js/panels/css-panel/style-sheet.reel/style-sheet.html | |
| parent | f887a74a7d03a2008a2c43d455a2b3e9223028af (diff) | |
| parent | c9852665eadc1acb9c1c881d207c4bd9ef88805f (diff) | |
| download | ninja-6e6c146f6e59c3942076b5d2f46b2962cc709926.tar.gz | |
Merge remote-tracking branch 'ninja-internal/master' into timeline-local
Diffstat (limited to 'js/panels/css-panel/style-sheet.reel/style-sheet.html')
| -rw-r--r-- | js/panels/css-panel/style-sheet.reel/style-sheet.html | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/js/panels/css-panel/style-sheet.reel/style-sheet.html b/js/panels/css-panel/style-sheet.reel/style-sheet.html index d08453fa..4f17c0fb 100644 --- a/js/panels/css-panel/style-sheet.reel/style-sheet.html +++ b/js/panels/css-panel/style-sheet.reel/style-sheet.html | |||
| @@ -40,7 +40,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
| 40 | } | 40 | } |
| 41 | }, | 41 | }, |
| 42 | "editButton": { | 42 | "editButton": { |
| 43 | "prototype": "montage/ui/button.reel", | 43 | "prototype": "montage/ui/native/button.reel", |
| 44 | "properties": { | 44 | "properties": { |
| 45 | "element": {"#": "edit-button"}, | 45 | "element": {"#": "edit-button"}, |
| 46 | "identifier": "editButton", | 46 | "identifier": "editButton", |
| @@ -53,7 +53,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
| 53 | 53 | ||
| 54 | }, | 54 | }, |
| 55 | "disableButton": { | 55 | "disableButton": { |
| 56 | "prototype": "montage/ui/button.reel", | 56 | "prototype": "montage/ui/native/button.reel", |
| 57 | "properties": { | 57 | "properties": { |
| 58 | "element": {"#": "disable-button"}, | 58 | "element": {"#": "disable-button"}, |
| 59 | "identifier": "disableButton", | 59 | "identifier": "disableButton", |
| @@ -66,7 +66,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
| 66 | 66 | ||
| 67 | }, | 67 | }, |
| 68 | "deleteButton": { | 68 | "deleteButton": { |
| 69 | "prototype": "montage/ui/button.reel", | 69 | "prototype": "montage/ui/native/button.reel", |
| 70 | "properties": { | 70 | "properties": { |
| 71 | "element": {"#": "delete-button"}, | 71 | "element": {"#": "delete-button"}, |
| 72 | "identifier": "deleteButton", | 72 | "identifier": "deleteButton", |