diff options
| author | Armen Kesablyan | 2012-06-19 01:03:59 -0700 |
|---|---|---|
| committer | Armen Kesablyan | 2012-06-19 01:03:59 -0700 |
| commit | 2e13a73e4ee980a6f73f6ff48b2a195eb209a7db (patch) | |
| tree | d352f5e769eae0e1b7b76ccbeafa9b174b1a9918 /js/components/gradientpicker.reel/gradientpicker.html | |
| parent | 244e608645778746d1a3b5aa0d4c0868f7c5c272 (diff) | |
| parent | c59eb371559a3061ce53223e249ca97daace5968 (diff) | |
| download | ninja-2e13a73e4ee980a6f73f6ff48b2a195eb209a7db.tar.gz | |
Merge branch 'refs/heads/master' into binding
Conflicts:
js/components/layout/tools-list.reel/tools-list.html
js/components/layout/tools-properties.reel/tools-properties.html
js/document/document-html.js
js/document/templates/app/main.js
js/panels/Panel.reel/Panel.js
node_modules/montage/ui/native-control.js
Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'js/components/gradientpicker.reel/gradientpicker.html')
| -rwxr-xr-x | js/components/gradientpicker.reel/gradientpicker.html | 33 |
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> |