aboutsummaryrefslogtreecommitdiff
path: root/js/components/gradientpicker.reel/gradientpicker.html
diff options
context:
space:
mode:
authorValerio Virgillito2012-06-18 22:17:02 -0700
committerValerio Virgillito2012-06-18 22:17:02 -0700
commit918a4f5870e972b6e4e301c3237e065a1ffd26f5 (patch)
tree86a13e3a9cbcc46abc2ca6bc2cf8c90f77711ed1 /js/components/gradientpicker.reel/gradientpicker.html
parentaefeb5f96bf6e8e993ce44c4f328b56e39196414 (diff)
parent69f69c7bf43bdd9a80d8efe329cd648f975f14e9 (diff)
downloadninja-918a4f5870e972b6e4e301c3237e065a1ffd26f5.tar.gz
Merge pull request #308 from joseeight/Color
Fixing no color application to all elements.
Diffstat (limited to 'js/components/gradientpicker.reel/gradientpicker.html')
-rwxr-xr-xjs/components/gradientpicker.reel/gradientpicker.html33
1 files changed, 24 insertions, 9 deletions
diff --git a/js/components/gradientpicker.reel/gradientpicker.html b/js/components/gradientpicker.reel/gradientpicker.html
index b0e23653..4765a677 100755
--- a/js/components/gradientpicker.reel/gradientpicker.html
+++ b/js/components/gradientpicker.reel/gradientpicker.html
@@ -6,11 +6,10 @@
6 (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. 6 (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.
7</copyright> 7</copyright>
8--> 8-->
9<html lang="en"> 9<html>
10
10 <head> 11 <head>
11 12
12 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
13
14 <link rel="stylesheet" type="text/css" href="css/gradientpicker.css"> 13 <link rel="stylesheet" type="text/css" href="css/gradientpicker.css">
15 14
16 <script type="text/montage-serialization"> 15 <script type="text/montage-serialization">
@@ -18,7 +17,12 @@
18 "owner": { 17 "owner": {
19 "prototype": "js/components/gradientpicker.reel[GradientPicker]", 18 "prototype": "js/components/gradientpicker.reel[GradientPicker]",
20 "properties": { 19 "properties": {
21 "element": {"#": "gradientpicker"} 20 "element": {"#": "gradientpicker"},
21 "radioLinear": {"#": "radio_linear"},
22 "radioRadial": {"#": "radio_radial"},
23 "trackCover": {"#": "cover"},
24 "trackMain": {"#": "track"},
25 "trackChips": {"#": "chips"}
22 26
23 } 27 }
24 } 28 }
@@ -32,14 +36,25 @@
32 <div data-montage-id="gradientpicker" class="gradientpicker"> 36 <div data-montage-id="gradientpicker" class="gradientpicker">
33 37
34 <div class="type"> 38 <div class="type">
35 <input type="radio" class="cp_gp_linear radio" name="gradient" value="linear" id="cp_gp_linear" checked="like a boss"/><label for="cp_gp_linear">Linear Gradient</label> 39
36 <input type="radio" class="cp_gp_radial radio" name="gradient" value="radial" id="cp_gp_radial"/><label for="cp_gp_radial">Radial Gradient</label> 40 <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"/>
41 <label for="cp_gp_linear">Linear Gradient</label>
42
43 <input data-montage-id="radio_radial" type="radio" class="cp_gp_radial radio" name="gradient" value="radial" id="cp_gp_radial"/>
44 <label for="cp_gp_radial">Radial Gradient</label>
45
37 </div> 46 </div>
38 47
39 <div class="cp_gp_slider"> 48 <div class="cp_gp_slider">
40 <div class="track_container"><div class="track"></div></div> 49
41 <div class="cover"></div> 50 <div class="track_container">
42 <div class="chips"></div> 51 <div data-montage-id="track" class="track"></div>
52 </div>
53
54 <div data-montage-id="cover" class="cover"></div>
55
56 <div data-montage-id="chips" class="chips"></div>
57
43 </div> 58 </div>
44 59
45 </div> 60 </div>