diff options
author | Jonathan Duran | 2012-07-17 09:30:22 -0700 |
---|---|---|
committer | Jonathan Duran | 2012-07-17 09:30:22 -0700 |
commit | 53051672a62208fbc96957719d8285fac6431ed6 (patch) | |
tree | 79d542ee811044e8af2ef84aa0d6662c6eb895c4 /js/panels/color/colorpanelbase.reel/colorpanelbase.html | |
parent | 7e2c2dbd040ed79a3f0678f91bd4b6db9cf69231 (diff) | |
parent | 5146f224258929415adf4a8022e492454b4e2476 (diff) | |
download | ninja-53051672a62208fbc96957719d8285fac6431ed6.tar.gz |
Merge branch 'refs/heads/NINJA-master' into TimelineUber
Conflicts:
js/panels/Timeline/DragDrop.js
js/panels/Timeline/Keyframe.reel/Keyframe.js
js/panels/Timeline/Layer.reel/Layer.js
js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js
js/panels/Timeline/Span.reel/Span.js
js/panels/Timeline/Style.reel/Style.js
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
js/panels/Timeline/Track.reel/Track.html
js/panels/Timeline/Track.reel/Track.js
js/panels/Timeline/Track.reel/css/Track.css
js/panels/Timeline/TrackSpacer.reel/TrackSpacer.html
js/panels/Timeline/TrackSpacer.reel/TrackSpacer.js
js/panels/Timeline/TrackSpacer.reel/css/TrackSpacer.css
js/panels/Timeline/Tween.reel/Tween.js
Signed-off-by: Jonathan Duran <jduran@motorola.com>
Diffstat (limited to 'js/panels/color/colorpanelbase.reel/colorpanelbase.html')
-rwxr-xr-x | js/panels/color/colorpanelbase.reel/colorpanelbase.html | 139 |
1 files changed, 70 insertions, 69 deletions
diff --git a/js/panels/color/colorpanelbase.reel/colorpanelbase.html b/js/panels/color/colorpanelbase.reel/colorpanelbase.html index 5918a3ae..6ed22197 100755 --- a/js/panels/color/colorpanelbase.reel/colorpanelbase.html +++ b/js/panels/color/colorpanelbase.reel/colorpanelbase.html | |||
@@ -1,25 +1,26 @@ | |||
1 | <!DOCTYPE html> | 1 | <!DOCTYPE html> |
2 | <!-- <copyright> | 2 | <!-- <copyright> |
3 | Copyright (c) 2012, Motorola Mobility, Inc | 3 | Copyright (c) 2012, Motorola Mobility LLC. |
4 | All Rights Reserved. | 4 | All Rights Reserved. |
5 | BSD License. | ||
6 | 5 | ||
7 | Redistribution and use in source and binary forms, with or without | 6 | Redistribution and use in source and binary forms, with or without |
8 | modification, are permitted provided that the following conditions are met: | 7 | modification, are permitted provided that the following conditions are met: |
9 | 8 | ||
10 | - Redistributions of source code must retain the above copyright notice, | 9 | * Redistributions of source code must retain the above copyright notice, |
11 | this list of conditions and the following disclaimer. | 10 | this list of conditions and the following disclaimer. |
12 | - Redistributions in binary form must reproduce the above copyright | 11 | |
13 | notice, this list of conditions and the following disclaimer in the | 12 | * Redistributions in binary form must reproduce the above copyright notice, |
14 | documentation and/or other materials provided with the distribution. | 13 | this list of conditions and the following disclaimer in the documentation |
15 | - Neither the name of Motorola Mobility nor the names of its contributors | 14 | and/or other materials provided with the distribution. |
16 | may be used to endorse or promote products derived from this software | 15 | |
17 | without specific prior written permission. | 16 | * Neither the name of Motorola Mobility LLC nor the names of its |
17 | contributors may be used to endorse or promote products derived from this | ||
18 | software without specific prior written permission. | ||
18 | 19 | ||
19 | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" | 20 | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" |
20 | AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | 21 | AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
21 | IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | 22 | IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
22 | ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE | 23 | ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE |
23 | LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | 24 | LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR |
24 | CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | 25 | CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF |
25 | SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | 26 | SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS |
@@ -29,12 +30,12 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | |||
29 | POSSIBILITY OF SUCH DAMAGE. | 30 | POSSIBILITY OF SUCH DAMAGE. |
30 | </copyright> --> | 31 | </copyright> --> |
31 | <html lang="en"> | 32 | <html lang="en"> |
32 | <head> | 33 | <head> |
33 | 34 | ||
34 | <meta http-equiv="content-type" content="text/html; charset=utf-8" /> | 35 | <meta http-equiv="content-type" content="text/html; charset=utf-8" /> |
35 | 36 | ||
36 | <link rel="stylesheet" type="text/css" href="css/colorpanelbase.css"> | 37 | <link rel="stylesheet" type="text/css" href="css/colorpanelbase.css"> |
37 | <script type="text/montage-serialization"> | 38 | <script type="text/montage-serialization"> |
38 | { | 39 | { |
39 | "owner": { | 40 | "owner": { |
40 | "prototype": "js/panels/Color/ColorPanelBase.reel", | 41 | "prototype": "js/panels/Color/ColorPanelBase.reel", |
@@ -68,57 +69,57 @@ POSSIBILITY OF SUCH DAMAGE. | |||
68 | } | 69 | } |
69 | } | 70 | } |
70 | 71 | ||
71 | } | 72 | } |
72 | </script> | 73 | </script> |
73 | 74 | ||
74 | </head> | 75 | </head> |
75 | 76 | ||
76 | <body> | 77 | <body> |
77 | 78 | ||
78 | <div data-montage-id="cp_expanded" class="cp_expanded"> | 79 | <div data-montage-id="cp_expanded" class="cp_expanded"> |
79 | <div class="cp_history"> | 80 | <div class="cp_history"> |
80 | <button data-montage-id="btn_current" class="cp_color_current">Current Color</button> | 81 | <button data-montage-id="btn_current" class="cp_color_current">Current Color</button> |
81 | <button data-montage-id="btn_previous" class="cp_color_previous">Previous Color</button> | 82 | <button data-montage-id="btn_previous" class="cp_color_previous">Previous Color</button> |
82 | </div> | 83 | </div> |
83 | <div class="cp_modes"> | 84 | <div class="cp_modes"> |
84 | <button data-montage-id="btn_rgb" class="cp_rgb_mode">RGB</button> | 85 | <button data-montage-id="btn_rgb" class="cp_rgb_mode">RGB</button> |
85 | <hr /> | 86 | <hr /> |
86 | <button data-montage-id="btn_hsl" class="cp_hsl_mode">HSL</button> | 87 | <button data-montage-id="btn_hsl" class="cp_hsl_mode">HSL</button> |
87 | </div> | 88 | </div> |
88 | <hr /> | 89 | <hr /> |
89 | <div class="cp_inputs"> | 90 | <div class="cp_inputs"> |
90 | <div class="cp_input_button"><button data-montage-id="btn_stroke" class="cpe_stroke">Stroke</button></div> | 91 | <div class="cp_input_button"><button data-montage-id="btn_stroke" class="cpe_stroke">Stroke</button></div> |
91 | <button data-montage-id="btn_istoke" class="cpe_stroke_icon"></button> | 92 | <button data-montage-id="btn_istoke" class="cpe_stroke_icon"></button> |
92 | <div class="cp_input_button"><button data-montage-id="btn_fill" class="cpe_fill">Fill</button></div> | 93 | <div class="cp_input_button"><button data-montage-id="btn_fill" class="cpe_fill">Fill</button></div> |
93 | <button data-montage-id="btn_ifill" class="cpe_fill_icon"></button> | 94 | <button data-montage-id="btn_ifill" class="cpe_fill_icon"></button> |
94 | </div> | 95 | </div> |
95 | <div class="cp_options"> | 96 | <div class="cp_options"> |
96 | <button data-montage-id="btn_default" class="cp_reset">Default Colors</button> | 97 | <button data-montage-id="btn_default" class="cp_reset">Default Colors</button> |
97 | <button data-montage-id="btn_nocolor" class="cp_nocolor">No Color</button> | 98 | <button data-montage-id="btn_nocolor" class="cp_nocolor">No Color</button> |
98 | <button data-montage-id="btn_swap" class="cp_swap">Swap Colors</button> | 99 | <button data-montage-id="btn_swap" class="cp_swap">Swap Colors</button> |
99 | </div> | 100 | </div> |
100 | <div class="cp_labels"> | 101 | <div class="cp_labels"> |
101 | <div data-montage-id="label1" class="sh_label1">R</div> | 102 | <div data-montage-id="label1" class="sh_label1">R</div> |
102 | <div data-montage-id="label2" class="sh_label2">G</div> | 103 | <div data-montage-id="label2" class="sh_label2">G</div> |
103 | <div data-montage-id="label3" class="sh_label3">B</div> | 104 | <div data-montage-id="label3" class="sh_label3">B</div> |
104 | <div data-montage-id="label4" class="sh_label4">A</div> | 105 | <div data-montage-id="label4" class="sh_label4">A</div> |
105 | </div> | 106 | </div> |
106 | <div class="cp_sliders"> | 107 | <div class="cp_sliders"> |
107 | <div data-montage-id="slider1" class="cp_slider1"></div> | 108 | <div data-montage-id="slider1" class="cp_slider1"></div> |
108 | <div data-montage-id="slider2" class="cp_slider2"></div> | 109 | <div data-montage-id="slider2" class="cp_slider2"></div> |
109 | <div data-montage-id="slider3" class="cp_slider3"></div> | 110 | <div data-montage-id="slider3" class="cp_slider3"></div> |
110 | <div data-montage-id="slider4" class="cp_slider4"></div> | 111 | <div data-montage-id="slider4" class="cp_slider4"></div> |
111 | </div> | 112 | </div> |
112 | <div class="cp_hottext"> | 113 | <div class="cp_hottext"> |
113 | <input data-montage-id="hottext1" class="cp_hottext1"/> | 114 | <input data-montage-id="hottext1" class="cp_hottext1"/> |
114 | <input data-montage-id="hottext2" class="cp_hottext2"/> | 115 | <input data-montage-id="hottext2" class="cp_hottext2"/> |
115 | <input data-montage-id="hottext3" class="cp_hottext3"/> | 116 | <input data-montage-id="hottext3" class="cp_hottext3"/> |
116 | <input data-montage-id="hottext4" class="cp_hottext4"/> | 117 | <input data-montage-id="hottext4" class="cp_hottext4"/> |
117 | </div> | 118 | </div> |
118 | <div class="cp_hex">#<input data-montage-id="hextext" class="cp_hottext5" maxlength="6" /></div> | 119 | <div class="cp_hex">#<input data-montage-id="hextext" class="cp_hottext5" maxlength="6" /></div> |
119 | <div class="cp_spectrum" data-montage-id="spectrum"></div> | 120 | <div class="cp_spectrum" data-montage-id="spectrum"></div> |
120 | </div> | 121 | </div> |
121 | 122 | ||
122 | </body> | 123 | </body> |
123 | 124 | ||
124 | </html> | 125 | </html> |