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/css-style.reel/css-style.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/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 |