aboutsummaryrefslogtreecommitdiff
path: root/js/components/gradientpicker.reel/gradientpicker.html
diff options
context:
space:
mode:
authorValerio Virgillito2012-07-09 14:35:44 -0700
committerValerio Virgillito2012-07-09 14:35:44 -0700
commit84b3327bd92faafab7954b5eb64c7abe24a3fe13 (patch)
tree3f56cbed2f08c5a81ea79eaf0bcb9bd031d8a627 /js/components/gradientpicker.reel/gradientpicker.html
parentc0a42c56f768a873ba637f5b86d5f6a84d4a3312 (diff)
parent40c6eb2c06b34f65a74d59ef9687251952858bab (diff)
downloadninja-84b3327bd92faafab7954b5eb64c7abe24a3fe13.tar.gz
Merge branch 'normalize' of https://github.com/kriskowal/ninja-internal
Conflicts: js/components/gradientpicker.reel/gradientpicker.js js/components/tools-properties/text-properties.reel/text-properties.js js/document/views/base.js js/document/views/design.js js/helper-classes/3D/StageLine.js js/helper-classes/3D/draw-utils.js js/lib/drawing/world.js js/lib/geom/circle.js js/lib/geom/line.js js/lib/geom/rectangle.js js/lib/geom/shape-primitive.js js/lib/rdge/materials/bump-metal-material.js js/lib/rdge/materials/flag-material.js js/lib/rdge/materials/fly-material.js js/lib/rdge/materials/julia-material.js js/lib/rdge/materials/keleidoscope-material.js js/lib/rdge/materials/mandel-material.js js/lib/rdge/materials/material.js js/lib/rdge/materials/plasma-material.js js/lib/rdge/materials/pulse-material.js js/lib/rdge/materials/radial-gradient-material.js js/lib/rdge/materials/taper-material.js js/lib/rdge/materials/twist-vert-material.js js/lib/rdge/materials/water-material.js js/panels/Materials/materials-library-panel.reel/materials-library-panel.html js/panels/Materials/materials-library-panel.reel/materials-library-panel.js js/panels/Materials/materials-popup.reel/materials-popup.html js/panels/Materials/materials-popup.reel/materials-popup.js js/tools/LineTool.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'js/components/gradientpicker.reel/gradientpicker.html')
-rwxr-xr-xjs/components/gradientpicker.reel/gradientpicker.html109
1 files changed, 54 insertions, 55 deletions
diff --git a/js/components/gradientpicker.reel/gradientpicker.html b/js/components/gradientpicker.reel/gradientpicker.html
index 96aeabdd..87aa6aa2 100755
--- a/js/components/gradientpicker.reel/gradientpicker.html
+++ b/js/components/gradientpicker.reel/gradientpicker.html
@@ -1,6 +1,5 @@
1<!DOCTYPE html> 1<!doctype html>
2<!-- 2<!-- <copyright>
3 <copyright>
4Copyright (c) 2012, Motorola Mobility, Inc 3Copyright (c) 2012, Motorola Mobility, Inc
5All Rights Reserved. 4All Rights Reserved.
6BSD License. 5BSD License.
@@ -32,57 +31,57 @@ POSSIBILITY OF SUCH DAMAGE.
32--> 31-->
33<html> 32<html>
34 33
35 <head> 34 <head>
36 35
37 <link rel="stylesheet" type="text/css" href="css/gradientpicker.css"> 36 <link rel="stylesheet" type="text/css" href="css/gradientpicker.css">
38 37
39 <script type="text/montage-serialization"> 38 <script type="text/montage-serialization">
40 { 39 {
41 "owner": { 40 "owner": {
42 "prototype": "js/components/gradientpicker.reel[GradientPicker]", 41 "prototype": "js/components/gradientpicker.reel[GradientPicker]",
43 "properties": { 42 "properties": {
44 "element": {"#": "gradientpicker"}, 43 "element": {"#": "gradientpicker"},
45 "radioLinear": {"#": "radio_linear"}, 44 "radioLinear": {"#": "radio_linear"},
46 "radioRadial": {"#": "radio_radial"}, 45 "radioRadial": {"#": "radio_radial"},
47 "trackCover": {"#": "cover"}, 46 "trackCover": {"#": "cover"},
48 "trackMain": {"#": "track"}, 47 "trackMain": {"#": "track"},
49 "trackChips": {"#": "chips"} 48 "trackChips": {"#": "chips"}
50 49
51 } 50 }
52 } 51 }
53 } 52 }
54 </script> 53 </script>
55 54
56 </head> 55 </head>
57 56
58 <body> 57 <body>
59 58
60 <div data-montage-id="gradientpicker" class="gradientpicker"> 59 <div data-montage-id="gradientpicker" class="gradientpicker">
61 60
62 <div class="type"> 61 <div class="type">
63 62
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"/> 63 <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> 64 <label for="cp_gp_linear">Linear Gradient</label>
66 65
67 <input data-montage-id="radio_radial" type="radio" class="cp_gp_radial radio" name="gradient" value="radial" id="cp_gp_radial"/> 66 <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> 67 <label for="cp_gp_radial">Radial Gradient</label>
69 68
70 </div> 69 </div>
71 70
72 <div class="cp_gp_slider"> 71 <div class="cp_gp_slider">
73 72
74 <div class="track_container"> 73 <div class="track_container">
75 <div data-montage-id="track" class="track"></div> 74 <div data-montage-id="track" class="track"></div>
76 </div> 75 </div>
77 76
78 <div data-montage-id="cover" class="cover"></div> 77 <div data-montage-id="cover" class="cover"></div>
79 78
80 <div data-montage-id="chips" class="chips"></div> 79 <div data-montage-id="chips" class="chips"></div>
81 80
82 </div> 81 </div>
83 82
84 </div> 83 </div>
85 84
86 </body> 85 </body>
87 86
88</html> 87</html>