diff options
author | Pushkar Joshi | 2012-03-02 12:24:33 -0800 |
---|---|---|
committer | Pushkar Joshi | 2012-03-02 12:24:33 -0800 |
commit | 4419209a1fd850ab468209b562b66b0242b42a9c (patch) | |
tree | bd7ca04f963f5a3aeb4b3c06db6f187903307d45 /js/panels/properties/sections/custom-rows/color-select.reel/color-select.html | |
parent | 1b68bb87c458877cb850a96d8a093d6064bc41dc (diff) | |
parent | ff0a956f33df034e9a009cfcb8999e469456a4b5 (diff) | |
download | ninja-4419209a1fd850ab468209b562b66b0242b42a9c.tar.gz |
Merge branch 'master' into brushtool
Diffstat (limited to 'js/panels/properties/sections/custom-rows/color-select.reel/color-select.html')
-rwxr-xr-x | js/panels/properties/sections/custom-rows/color-select.reel/color-select.html | 51 |
1 files changed, 0 insertions, 51 deletions
diff --git a/js/panels/properties/sections/custom-rows/color-select.reel/color-select.html b/js/panels/properties/sections/custom-rows/color-select.reel/color-select.html deleted file mode 100755 index 9c2588b9..00000000 --- a/js/panels/properties/sections/custom-rows/color-select.reel/color-select.html +++ /dev/null | |||
@@ -1,51 +0,0 @@ | |||
1 | <!DOCTYPE html> | ||
2 | <!-- <copyright> | ||
3 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | ||
4 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> | ||
5 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | ||
6 | </copyright> --> | ||
7 | <html lang="en"> | ||
8 | <head> | ||
9 | <script type="text/montage-serialization"> | ||
10 | { | ||
11 | "owner": { | ||
12 | "module" : "js/panels/properties/sections/custom-rows/color-select.reel", | ||
13 | "name" : "ColorSelect", | ||
14 | "properties" : { | ||
15 | "element" : {"#": "section"}, | ||
16 | "Stroke" : {"#": "Stroke"}, | ||
17 | "Fill" : {"#": "Fill"} | ||
18 | } | ||
19 | }, | ||
20 | |||
21 | |||
22 | "colorChip": { | ||
23 | "module" : "js/components/ui/color-chip.reel", | ||
24 | "name" : "ColorChip", | ||
25 | "properties" : { | ||
26 | "element" : {"#": "Stroke"} | ||
27 | } | ||
28 | }, | ||
29 | |||
30 | "colorChip2": { | ||
31 | "module" : "js/components/ui/color-chip.reel", | ||
32 | "name" : "ColorChip", | ||
33 | "properties" : { | ||
34 | "element" : {"#": "Fill"}, | ||
35 | "mode": "fill" | ||
36 | } | ||
37 | } | ||
38 | } | ||
39 | </script> | ||
40 | </head> | ||
41 | <body> | ||
42 | <div id="section"> | ||
43 | <section class="fieldCol"> | ||
44 | <article class="fieldRow colorSelect"> | ||
45 | <div id="Stroke"></div> | ||
46 | <div id="Fill"></div> | ||
47 | </article> | ||
48 | </section> | ||
49 | </div> | ||
50 | </body> | ||
51 | </html> \ No newline at end of file | ||