diff options
| author | Jon Reid | 2012-05-15 11:24:53 -0700 |
|---|---|---|
| committer | Jon Reid | 2012-05-15 11:24:53 -0700 |
| commit | 3e02135df2ee028ae43d0e2456c04e24ecee0e86 (patch) | |
| tree | d6dcab6756e3da0038a39527cfe0f9ca89e92310 /js/components/ui/color-chip.reel/color-chip.html | |
| parent | 53a604d0ccb1315576b94406cf3b0b958162307b (diff) | |
| parent | e33a4e58c271a9507082694a5268b840fdd05968 (diff) | |
| download | ninja-3e02135df2ee028ae43d0e2456c04e24ecee0e86.tar.gz | |
Merge branch 'timeline-local' into timeline-multiselect
Conflicts:
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
resolved using theirs. (selectLayers)
Diffstat (limited to 'js/components/ui/color-chip.reel/color-chip.html')
| -rwxr-xr-x | js/components/ui/color-chip.reel/color-chip.html | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/js/components/ui/color-chip.reel/color-chip.html b/js/components/ui/color-chip.reel/color-chip.html index a365d775..647f7e79 100755 --- a/js/components/ui/color-chip.reel/color-chip.html +++ b/js/components/ui/color-chip.reel/color-chip.html | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | <!DOCTYPE HTML> | 1 | <!DOCTYPE HTML> |
| 2 | <!-- <copyright> | 2 | <!-- <copyright> |
| 3 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | 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/> | 4 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> |
| @@ -11,8 +11,7 @@ | |||
| 11 | <script type="text/montage-serialization"> | 11 | <script type="text/montage-serialization"> |
| 12 | { | 12 | { |
| 13 | "owner": { | 13 | "owner": { |
| 14 | "module": "js/components/ui/color-chip.reel", | 14 | "prototype": "js/components/ui/color-chip.reel", |
| 15 | "name": "ColorChip", | ||
| 16 | "properties": { | 15 | "properties": { |
| 17 | "element": {"#": "colorChipContainer"}, | 16 | "element": {"#": "colorChipContainer"}, |
| 18 | "icon": {"#": "chipIcon"}, | 17 | "icon": {"#": "chipIcon"}, |
| @@ -24,13 +23,11 @@ | |||
| 24 | </head> | 23 | </head> |
| 25 | <body> | 24 | <body> |
| 26 | <!-- TODO: This should not use the 'colortoolbar' class, this is the wrong application of this class --> | 25 | <!-- TODO: This should not use the 'colortoolbar' class, this is the wrong application of this class --> |
| 27 | <div id="colorChipContainer" class="colortoolbar"> | 26 | <div data-montage-id="colorChipContainer" class="colortoolbar"> |
| 28 | 27 | <div data-montage-id="chipIcon"></div> | |
| 29 | <div id="chipIcon"></div> | 28 | <div class="chipContainer"> |
| 30 | 29 | <button data-montage-id="chipButton"></button> | |
| 31 | <div class="chipContainer"><button id="chipButton"></button></div> | 30 | </div> |
| 32 | |||
| 33 | </div> | 31 | </div> |
| 34 | |||
| 35 | </body> | 32 | </body> |
| 36 | </html> \ No newline at end of file | 33 | </html> \ No newline at end of file |