diff options
author | Jose Antonio Marquez | 2012-06-20 16:47:25 -0700 |
---|---|---|
committer | Jose Antonio Marquez | 2012-06-20 16:47:25 -0700 |
commit | 54b15b3c39835ea999d9ddd8038a5531630e266d (patch) | |
tree | c207d1290be0e894a57b03098bbb7bbe5f2aee86 /js/panels/css-panel | |
parent | ba125a7213cc257d648b22afb14f76d43f60d00d (diff) | |
parent | 392a559e90357d48c910a07617261483b2b45476 (diff) | |
download | ninja-54b15b3c39835ea999d9ddd8038a5531630e266d.tar.gz |
Merge branch 'refs/heads/Ninja-Internal' into FileIO
Diffstat (limited to 'js/panels/css-panel')
3 files changed, 5 insertions, 5 deletions
diff --git a/js/panels/css-panel/css-style.reel/css-style.html b/js/panels/css-panel/css-style.reel/css-style.html index 0f16b3d8..4e670cdc 100644 --- a/js/panels/css-panel/css-style.reel/css-style.html +++ b/js/panels/css-panel/css-style.reel/css-style.html | |||
@@ -24,7 +24,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
24 | "object": "js/panels/CSSPanel/css-property-name-list" | 24 | "object": "js/panels/CSSPanel/css-property-name-list" |
25 | }, | 25 | }, |
26 | "checkbox": { | 26 | "checkbox": { |
27 | "prototype": "montage/ui/checkbox.reel", | 27 | "prototype": "montage/ui/native/input-checkbox.reel", |
28 | "properties": { | 28 | "properties": { |
29 | "element": {"#": "disable-checkbox"}, | 29 | "element": {"#": "disable-checkbox"}, |
30 | "checked": true | 30 | "checked": true |
diff --git a/js/panels/css-panel/rule-components/css-style-rule.reel/css-style-rule.html b/js/panels/css-panel/rule-components/css-style-rule.reel/css-style-rule.html index 8b0c3101..99021917 100644 --- a/js/panels/css-panel/rule-components/css-style-rule.reel/css-style-rule.html +++ b/js/panels/css-panel/rule-components/css-style-rule.reel/css-style-rule.html | |||
@@ -49,7 +49,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
49 | } | 49 | } |
50 | }, | 50 | }, |
51 | "sheetLink": { | 51 | "sheetLink": { |
52 | "prototype": "montage/ui/anchor.reel", | 52 | "prototype": "montage/ui/native/anchor.reel", |
53 | "properties": { | 53 | "properties": { |
54 | "element": {"#": "style-sheet-name"} | 54 | "element": {"#": "style-sheet-name"} |
55 | } | 55 | } |
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", |