diff options
author | Eric Guzman | 2012-03-17 00:05:14 -0700 |
---|---|---|
committer | Eric Guzman | 2012-03-17 00:05:14 -0700 |
commit | a3192d8bc0f8c0698265817c14dcd2284fd89d7d (patch) | |
tree | 497ac55f550ed52f9d73b464aafb2aa6cb5f5038 /js/panels/color/colortoolbar.reel/colortoolbar.html | |
parent | a6a6f9bcc5ff92f5bb5e9275336dfaec2d8e8f4c (diff) | |
parent | 954f5a13e371febcb1c0fb8015c577ee51c23130 (diff) | |
download | ninja-a3192d8bc0f8c0698265817c14dcd2284fd89d7d.tar.gz |
Merge branch 'refs/heads/master' into AddAnimationsLibrary
Conflicts:
js/panels/presets/default-transition-presets.js
Diffstat (limited to 'js/panels/color/colortoolbar.reel/colortoolbar.html')
-rwxr-xr-x | js/panels/color/colortoolbar.reel/colortoolbar.html | 54 |
1 files changed, 54 insertions, 0 deletions
diff --git a/js/panels/color/colortoolbar.reel/colortoolbar.html b/js/panels/color/colortoolbar.reel/colortoolbar.html new file mode 100755 index 00000000..9ab54836 --- /dev/null +++ b/js/panels/color/colortoolbar.reel/colortoolbar.html | |||
@@ -0,0 +1,54 @@ | |||
1 | <!DOCTYPE HTML> | ||
2 | |||
3 | <!DOCTYPE html> | ||
4 | <!-- <copyright> | ||
5 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | ||
6 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> | ||
7 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | ||
8 | </copyright> --> | ||
9 | |||
10 | <html lang="en"> | ||
11 | <head> | ||
12 | <meta http-equiv="content-type" content="text/html; charset=utf-8" /> | ||
13 | <link rel="stylesheet" type="text/css" href="css/colortoolbar.css"> | ||
14 | |||
15 | <script type="text/montage-serialization"> | ||
16 | { | ||
17 | |||
18 | "owner": { | ||
19 | "module": "js/panels/Color/colortoolbar.reel", | ||
20 | "name": "ColorToolbar", | ||
21 | "properties": { | ||
22 | "element": {"#": "colortoolbar"} | ||
23 | } | ||
24 | } | ||
25 | } | ||
26 | </script> | ||
27 | |||
28 | </head> | ||
29 | |||
30 | <body> | ||
31 | |||
32 | <div id="colortoolbar" class="colortoolbar"> | ||
33 | |||
34 | <div class="cpe_stroke_icon selected"></div> | ||
35 | |||
36 | <div class="cpe_colortoolbar_container"> | ||
37 | |||
38 | <button></button> | ||
39 | |||
40 | </div> | ||
41 | |||
42 | <div class="cpe_fill_icon selected"></div> | ||
43 | |||
44 | <div class="cpe_colortoolbar_container"> | ||
45 | |||
46 | <button></button> | ||
47 | |||
48 | </div> | ||
49 | |||
50 | </div> | ||
51 | |||
52 | </body> | ||
53 | |||
54 | </html> \ No newline at end of file | ||