diff options
| author | Eric Guzman | 2012-03-12 15:33:04 -0700 |
|---|---|---|
| committer | Eric Guzman | 2012-03-12 15:33:04 -0700 |
| commit | 7e3161153b87b891875ac65368a19aed12909fa3 (patch) | |
| tree | b80f48d711a9729fc39dbbdff28c4f0620e7302d /js/panels/properties.reel/sections/custom-rows/color-select.reel/color-select.html | |
| parent | 7a28932ba8a7517bbaaabe1f5edf678416aafc9c (diff) | |
| parent | 69d90467865a1384725b2301901be2180c5a841f (diff) | |
| download | ninja-7e3161153b87b891875ac65368a19aed12909fa3.tar.gz | |
Merge branch 'refs/heads/master' into CSSPanelUpdates
Conflicts:
js/panels/PanelContainer/PanelContainer.reel/PanelContainer.js
Diffstat (limited to 'js/panels/properties.reel/sections/custom-rows/color-select.reel/color-select.html')
| -rwxr-xr-x | js/panels/properties.reel/sections/custom-rows/color-select.reel/color-select.html | 53 |
1 files changed, 53 insertions, 0 deletions
diff --git a/js/panels/properties.reel/sections/custom-rows/color-select.reel/color-select.html b/js/panels/properties.reel/sections/custom-rows/color-select.reel/color-select.html new file mode 100755 index 00000000..58a50a0d --- /dev/null +++ b/js/panels/properties.reel/sections/custom-rows/color-select.reel/color-select.html | |||
| @@ -0,0 +1,53 @@ | |||
| 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.reel/sections/custom-rows/color-select.reel", | ||
| 13 | "name" : "ColorSelect", | ||
| 14 | "properties" : { | ||
| 15 | "element" : {"#": "section"}, | ||
| 16 | "Stroke" : {"#": "Stroke"}, | ||
| 17 | "Fill" : {"#": "Fill"}, | ||
| 18 | "strokeChip" : {"@": "colorChip"}, | ||
| 19 | "fillChip" : {"@": "colorChip2"} | ||
| 20 | } | ||
| 21 | }, | ||
| 22 | |||
| 23 | |||
| 24 | "colorChip": { | ||
| 25 | "module" : "js/components/ui/color-chip.reel", | ||
| 26 | "name" : "ColorChip", | ||
| 27 | "properties" : { | ||
| 28 | "element" : {"#": "Stroke"} | ||
| 29 | } | ||
| 30 | }, | ||
| 31 | |||
| 32 | "colorChip2": { | ||
| 33 | "module" : "js/components/ui/color-chip.reel", | ||
| 34 | "name" : "ColorChip", | ||
| 35 | "properties" : { | ||
| 36 | "element" : {"#": "Fill"}, | ||
| 37 | "mode": "fill" | ||
| 38 | } | ||
| 39 | } | ||
| 40 | } | ||
| 41 | </script> | ||
| 42 | </head> | ||
| 43 | <body> | ||
| 44 | <div id="section"> | ||
| 45 | <section class="fieldCol"> | ||
| 46 | <article class="fieldRow colorSelect"> | ||
| 47 | <div id="Stroke"></div> | ||
| 48 | <div id="Fill"></div> | ||
| 49 | </article> | ||
| 50 | </section> | ||
| 51 | </div> | ||
| 52 | </body> | ||
| 53 | </html> \ No newline at end of file | ||