diff options
author | Jose Antonio Marquez | 2012-06-20 16:48:34 -0700 |
---|---|---|
committer | Jose Antonio Marquez | 2012-06-20 16:48:34 -0700 |
commit | 4eff115126ab946c5852d787fd596e07b156c9a5 (patch) | |
tree | f7d45b260f2fb5ba5dc4d1879076ca032d5ae2e6 /js/panels/css-panel/css-style.reel/css-style.html | |
parent | 7615da5c6ba54bd082eac4b8a6d9196084e5c590 (diff) | |
parent | 392a559e90357d48c910a07617261483b2b45476 (diff) | |
download | ninja-4eff115126ab946c5852d787fd596e07b156c9a5.tar.gz |
Merge branch 'refs/heads/Ninja-Internal' into Color
Diffstat (limited to 'js/panels/css-panel/css-style.reel/css-style.html')
-rw-r--r-- | js/panels/css-panel/css-style.reel/css-style.html | 2 |
1 files changed, 1 insertions, 1 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 |