diff options
author | Ananya Sen | 2012-07-09 16:52:49 -0700 |
---|---|---|
committer | Ananya Sen | 2012-07-09 16:52:49 -0700 |
commit | 2eb84584f44b8c774479d1af2ee1d810597474cf (patch) | |
tree | 64cb3e09a8daeb340261dd7f3869c73f7b90b643 /js/panels/Timeline/Style.reel/Style.html | |
parent | bf9dba001ec84243e2f12cd13b0c0ae020fba4a2 (diff) | |
parent | cee0deca695359ab468bd06d0e05ed3b2010b338 (diff) | |
download | ninja-2eb84584f44b8c774479d1af2ee1d810597474cf.tar.gz |
Merge branch 'refs/heads/ninja-internal-master' into codemirror-custom-theme-removal
Conflicts:
js/code-editor/codemirror-ninja/theme/lesser-dark-ninja.css
js/code-editor/codemirror-ninja/theme/xq-dark-ninja.css
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Diffstat (limited to 'js/panels/Timeline/Style.reel/Style.html')
-rw-r--r-- | js/panels/Timeline/Style.reel/Style.html | 161 |
1 files changed, 81 insertions, 80 deletions
diff --git a/js/panels/Timeline/Style.reel/Style.html b/js/panels/Timeline/Style.reel/Style.html index 271748ab..cbc62bbd 100644 --- a/js/panels/Timeline/Style.reel/Style.html +++ b/js/panels/Timeline/Style.reel/Style.html | |||
@@ -1,25 +1,26 @@ | |||
1 | <!DOCTYPE html> | 1 | <!doctype html> |
2 | <!-- <copyright> | 2 | <!-- <copyright> |
3 | Copyright (c) 2012, Motorola Mobility, Inc | 3 | Copyright (c) 2012, Motorola Mobility LLC. |
4 | All Rights Reserved. | 4 | All Rights Reserved. |
5 | BSD License. | ||
6 | 5 | ||
7 | Redistribution and use in source and binary forms, with or without | 6 | Redistribution and use in source and binary forms, with or without |
8 | modification, are permitted provided that the following conditions are met: | 7 | modification, are permitted provided that the following conditions are met: |
9 | 8 | ||
10 | - Redistributions of source code must retain the above copyright notice, | 9 | * Redistributions of source code must retain the above copyright notice, |
11 | this list of conditions and the following disclaimer. | 10 | this list of conditions and the following disclaimer. |
12 | - Redistributions in binary form must reproduce the above copyright | 11 | |
13 | notice, this list of conditions and the following disclaimer in the | 12 | * Redistributions in binary form must reproduce the above copyright notice, |
14 | documentation and/or other materials provided with the distribution. | 13 | this list of conditions and the following disclaimer in the documentation |
15 | - Neither the name of Motorola Mobility nor the names of its contributors | 14 | and/or other materials provided with the distribution. |
16 | may be used to endorse or promote products derived from this software | 15 | |
17 | 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. | ||
18 | 19 | ||
19 | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" | 20 | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" |
20 | AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | 21 | AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
21 | IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | 22 | IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
22 | ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE | 23 | ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE |
23 | LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | 24 | LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR |
24 | CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | 25 | CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF |
25 | SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | 26 | SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS |
@@ -29,10 +30,10 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | |||
29 | POSSIBILITY OF SUCH DAMAGE. | 30 | POSSIBILITY OF SUCH DAMAGE. |
30 | </copyright> --> | 31 | </copyright> --> |
31 | <html lang="en"> | 32 | <html lang="en"> |
32 | <head> | 33 | <head> |
33 | <meta http-equiv="content-type" content="text/html; charset=utf-8" /> | 34 | <meta http-equiv="content-type" content="text/html; charset=utf-8" /> |
34 | <link rel="stylesheet" type="text/css" href="css/Style.css"> | 35 | <link rel="stylesheet" type="text/css" href="css/Style.css"> |
35 | <script type="text/montage-serialization"> | 36 | <script type="text/montage-serialization"> |
36 | { | 37 | { |
37 | "owner": { | 38 | "owner": { |
38 | "prototype": "js/panels/Timeline/Style.reel", | 39 | "prototype": "js/panels/Timeline/Style.reel", |
@@ -47,73 +48,73 @@ POSSIBILITY OF SUCH DAMAGE. | |||
47 | "_fillColorCtrl": {"#": "fillColorCtrl"} | 48 | "_fillColorCtrl": {"#": "fillColorCtrl"} |
48 | } | 49 | } |
49 | }, | 50 | }, |
50 | "dtext1" : { | 51 | "dtext1" : { |
51 | "prototype" : "montage/ui/dynamic-text.reel", | 52 | "prototype" : "montage/ui/dynamic-text.reel", |
52 | "properties" : { | 53 | "properties" : { |
53 | "element" : {"#" : "container-property"} | 54 | "element" : {"#" : "container-property"} |
54 | }, | 55 | }, |
55 | "bindings" : { | 56 | "bindings" : { |
56 | "value" : { | 57 | "value" : { |
57 | "boundObject" : {"@" : "owner"}, | 58 | "boundObject" : {"@" : "owner"}, |
58 | "boundObjectPropertyPath" : "editorProperty", | 59 | "boundObjectPropertyPath" : "editorProperty", |
59 | "oneway" : false | 60 | "oneway" : false |
60 | } | 61 | } |
61 | } | 62 | } |
62 | }, | 63 | }, |
63 | "hottextunit" : { | 64 | "hottextunit" : { |
64 | "prototype" : "js/components/hottextunit.reel[HotTextUnit]", | 65 | "prototype" : "js/components/hottextunit.reel[HotTextUnit]", |
65 | "properties" : { | 66 | "properties" : { |
66 | "element" : {"#":"value-editor-hottext"} | 67 | "element" : {"#":"value-editor-hottext"} |
67 | }, | 68 | }, |
68 | "bindings" : { | 69 | "bindings" : { |
69 | "value" : { | 70 | "value" : { |
70 | "boundObject" : {"@" : "owner"}, | 71 | "boundObject" : {"@" : "owner"}, |
71 | "boundObjectPropertyPath" : "editorValue", | 72 | "boundObjectPropertyPath" : "editorValue", |
72 | "oneway" : false | 73 | "oneway" : false |
73 | } | 74 | } |
74 | } | 75 | } |
75 | }, | 76 | }, |
76 | "hintable" : { | 77 | "hintable" : { |
77 | "prototype" : "js/components/hintable.reel", | 78 | "prototype" : "js/components/hintable.reel", |
78 | "properties" : { | 79 | "properties" : { |
79 | "element" : {"#":"style-hintable"} | 80 | "element" : {"#":"style-hintable"} |
80 | }, | 81 | }, |
81 | "bindings" : { | 82 | "bindings" : { |
82 | "value" : { | 83 | "value" : { |
83 | "boundObject" : {"@" : "owner"}, | 84 | "boundObject" : {"@" : "owner"}, |
84 | "boundObjectPropertyPath" : "editorProperty", | 85 | "boundObjectPropertyPath" : "editorProperty", |
85 | "oneway" : true | 86 | "oneway" : true |
86 | } | 87 | } |
87 | } | 88 | } |
88 | } | 89 | } |
89 | } | 90 | } |
90 | </script> | 91 | </script> |
91 | </head> | 92 | </head> |
92 | <body> | 93 | <body> |
93 | <div data-montage-id="style-container"> | 94 | <div data-montage-id="style-container"> |
94 | <div class="style-padding"> | 95 | <div class="style-padding"> |
95 | <div class="row-hintable hidden"> | 96 | <div class="row-hintable hidden"> |
96 | <div data-montage-id="style-hintable"></div> | 97 | <div data-montage-id="style-hintable"></div> |
97 | </div> | 98 | </div> |
98 | <div class="container-propvals hidden"> | 99 | <div class="container-propvals hidden"> |
99 | <div class="cell-property"> | 100 | <div class="cell-property"> |
100 | <div data-montage-id="container-property">property</div> | 101 | <div data-montage-id="container-property">property</div> |
101 | </div> | 102 | </div> |
102 | <div class="cell-value value-editor editor-hottext hidden"> | 103 | <div class="cell-value value-editor editor-hottext hidden"> |
103 | <div data-montage-id="value-editor-hottext"></div> | 104 | <div data-montage-id="value-editor-hottext"></div> |
104 | </div> | 105 | </div> |
105 | <div class="cell-value value-editor editor-color hidden"> | 106 | <div class="cell-value value-editor editor-color hidden"> |
106 | <div data-montage-id="value-editor-color"> | 107 | <div data-montage-id="value-editor-color"> |
107 | <div data-montage-id="fillColorCtrl" class="toolColorChipCtrl color-chip-position"></div> | 108 | <div data-montage-id="fillColorCtrl" class="toolColorChipCtrl color-chip-position"></div> |
108 | </div> | 109 | </div> |
109 | </div> | 110 | </div> |
110 | <div class="cell-value value-editor editor-input hidden"> | 111 | <div class="cell-value value-editor editor-input hidden"> |
111 | <!-- <div data-montage-id="value-editor-input"></div> --> | 112 | <!-- <div data-montage-id="value-editor-input"></div> --> |
112 | <input type="text" class="nj-skinned" value="" /> | 113 | <input type="text" class="nj-skinned" value="" /> |
113 | </div> | 114 | </div> |
114 | </div> | 115 | </div> |
115 | 116 | ||
116 | </div> | 117 | </div> |
117 | </div> | 118 | </div> |
118 | </body> | 119 | </body> |
119 | </html> | 120 | </html> |