aboutsummaryrefslogtreecommitdiff
path: root/js/components/gradientpicker.reel/gradientpicker.html
diff options
context:
space:
mode:
authorJonathan Duran2012-07-17 09:30:22 -0700
committerJonathan Duran2012-07-17 09:30:22 -0700
commit53051672a62208fbc96957719d8285fac6431ed6 (patch)
tree79d542ee811044e8af2ef84aa0d6662c6eb895c4 /js/components/gradientpicker.reel/gradientpicker.html
parent7e2c2dbd040ed79a3f0678f91bd4b6db9cf69231 (diff)
parent5146f224258929415adf4a8022e492454b4e2476 (diff)
downloadninja-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/components/gradientpicker.reel/gradientpicker.html')
-rwxr-xr-xjs/components/gradientpicker.reel/gradientpicker.html132
1 files changed, 66 insertions, 66 deletions
diff --git a/js/components/gradientpicker.reel/gradientpicker.html b/js/components/gradientpicker.reel/gradientpicker.html
index 96aeabdd..10f502f0 100755
--- a/js/components/gradientpicker.reel/gradientpicker.html
+++ b/js/components/gradientpicker.reel/gradientpicker.html
@@ -1,26 +1,26 @@
1<!DOCTYPE html> 1<!DOCTYPE html>
2<!-- 2<!-- <copyright>
3 <copyright> 3Copyright (c) 2012, Motorola Mobility LLC.
4Copyright (c) 2012, Motorola Mobility, Inc
5All Rights Reserved. 4All Rights Reserved.
6BSD License.
7 5
8Redistribution and use in source and binary forms, with or without 6Redistribution and use in source and binary forms, with or without
9modification, are permitted provided that the following conditions are met: 7modification, are permitted provided that the following conditions are met:
10 8
11 - Redistributions of source code must retain the above copyright notice, 9* Redistributions of source code must retain the above copyright notice,
12 this list of conditions and the following disclaimer. 10 this list of conditions and the following disclaimer.
13 - Redistributions in binary form must reproduce the above copyright 11
14 notice, this list of conditions and the following disclaimer in the 12* Redistributions in binary form must reproduce the above copyright notice,
15 documentation and/or other materials provided with the distribution. 13 this list of conditions and the following disclaimer in the documentation
16 - Neither the name of Motorola Mobility nor the names of its contributors 14 and/or other materials provided with the distribution.
17 may be used to endorse or promote products derived from this software 15
18 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.
19 19
20THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 20THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
21AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 21AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
22IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 22IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
23ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE 23ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
24LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 24LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
25CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 25CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
26SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 26SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
@@ -32,57 +32,57 @@ POSSIBILITY OF SUCH DAMAGE.
32--> 32-->
33<html> 33<html>
34 34
35 <head> 35 <head>
36 36
37 <link rel="stylesheet" type="text/css" href="css/gradientpicker.css"> 37 <link rel="stylesheet" type="text/css" href="css/gradientpicker.css">
38 38
39 <script type="text/montage-serialization"> 39 <script type="text/montage-serialization">
40 { 40 {
41 "owner": { 41 "owner": {
42 "prototype": "js/components/gradientpicker.reel[GradientPicker]", 42 "prototype": "js/components/gradientpicker.reel[GradientPicker]",
43 "properties": { 43 "properties": {
44 "element": {"#": "gradientpicker"}, 44 "element": {"#": "gradientpicker"},
45 "radioLinear": {"#": "radio_linear"}, 45 "radioLinear": {"#": "radio_linear"},
46 "radioRadial": {"#": "radio_radial"}, 46 "radioRadial": {"#": "radio_radial"},
47 "trackCover": {"#": "cover"}, 47 "trackCover": {"#": "cover"},
48 "trackMain": {"#": "track"}, 48 "trackMain": {"#": "track"},
49 "trackChips": {"#": "chips"} 49 "trackChips": {"#": "chips"}
50 50
51 } 51 }
52 } 52 }
53 } 53 }
54 </script> 54 </script>
55 55
56 </head> 56 </head>
57 57
58 <body> 58 <body>
59 59
60 <div data-montage-id="gradientpicker" class="gradientpicker"> 60 <div data-montage-id="gradientpicker" class="gradientpicker">
61 61
62 <div class="type"> 62 <div class="type">
63 63
64 <input data-montage-id="radio_linear" type="radio" class="cp_gp_linear radio" name="gradient" value="linear" id="cp_gp_linear" checked="like a boss"/> 64 <input data-montage-id="radio_linear" type="radio" class="cp_gp_linear radio" name="gradient" value="linear" id="cp_gp_linear" checked="like a boss"/>
65 <label for="cp_gp_linear">Linear Gradient</label> 65 <label for="cp_gp_linear">Linear Gradient</label>
66 66
67 <input data-montage-id="radio_radial" type="radio" class="cp_gp_radial radio" name="gradient" value="radial" id="cp_gp_radial"/> 67 <input data-montage-id="radio_radial" type="radio" class="cp_gp_radial radio" name="gradient" value="radial" id="cp_gp_radial"/>
68 <label for="cp_gp_radial">Radial Gradient</label> 68 <label for="cp_gp_radial">Radial Gradient</label>
69 69
70 </div> 70 </div>
71 71
72 <div class="cp_gp_slider"> 72 <div class="cp_gp_slider">
73 73
74 <div class="track_container"> 74 <div class="track_container">
75 <div data-montage-id="track" class="track"></div> 75 <div data-montage-id="track" class="track"></div>
76 </div> 76 </div>
77 77
78 <div data-montage-id="cover" class="cover"></div> 78 <div data-montage-id="cover" class="cover"></div>
79 79
80 <div data-montage-id="chips" class="chips"></div> 80 <div data-montage-id="chips" class="chips"></div>
81 81
82 </div> 82 </div>
83 83
84 </div> 84 </div>
85 85
86 </body> 86 </body>
87 87
88</html> 88</html>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-25 14:26:42 +0000