diff options
author | Jonathan Duran | 2012-07-17 09:30:22 -0700 |
---|---|---|
committer | Jonathan Duran | 2012-07-17 09:30:22 -0700 |
commit | 53051672a62208fbc96957719d8285fac6431ed6 (patch) | |
tree | 79d542ee811044e8af2ef84aa0d6662c6eb895c4 /js/panels/Materials/materials-popup.reel | |
parent | 7e2c2dbd040ed79a3f0678f91bd4b6db9cf69231 (diff) | |
parent | 5146f224258929415adf4a8022e492454b4e2476 (diff) | |
download | ninja-53051672a62208fbc96957719d8285fac6431ed6.tar.gz |
Merge branch 'refs/heads/NINJA-master' into TimelineUber
Conflicts:
js/panels/Timeline/DragDrop.js
js/panels/Timeline/Keyframe.reel/Keyframe.js
js/panels/Timeline/Layer.reel/Layer.js
js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js
js/panels/Timeline/Span.reel/Span.js
js/panels/Timeline/Style.reel/Style.js
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
js/panels/Timeline/Track.reel/Track.html
js/panels/Timeline/Track.reel/Track.js
js/panels/Timeline/Track.reel/css/Track.css
js/panels/Timeline/TrackSpacer.reel/TrackSpacer.html
js/panels/Timeline/TrackSpacer.reel/TrackSpacer.js
js/panels/Timeline/TrackSpacer.reel/css/TrackSpacer.css
js/panels/Timeline/Tween.reel/Tween.js
Signed-off-by: Jonathan Duran <jduran@motorola.com>
Diffstat (limited to 'js/panels/Materials/materials-popup.reel')
3 files changed, 653 insertions, 656 deletions
diff --git a/js/panels/Materials/materials-popup.reel/materials-popup.css b/js/panels/Materials/materials-popup.reel/materials-popup.css index a5362615..23887405 100755 --- a/js/panels/Materials/materials-popup.reel/materials-popup.css +++ b/js/panels/Materials/materials-popup.reel/materials-popup.css | |||
@@ -1,25 +1,26 @@ | |||
1 | @charset "UTF-8"; | 1 | @charset "UTF-8"; |
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 |
@@ -30,7 +31,8 @@ POSSIBILITY OF SUCH DAMAGE. | |||
30 | </copyright> */ | 31 | </copyright> */ |
31 | 32 | ||
32 | .materials_popup { | 33 | .materials_popup { |
33 | width:400px; | 34 | width:auto; |
35 | min-width: 300px; | ||
34 | font-size: 12px; | 36 | font-size: 12px; |
35 | overflow: hidden; | 37 | overflow: hidden; |
36 | background: #494949; | 38 | background: #494949; |
@@ -56,6 +58,7 @@ POSSIBILITY OF SUCH DAMAGE. | |||
56 | .mp_preview { | 58 | .mp_preview { |
57 | height: 100px; | 59 | height: 100px; |
58 | text-align: center; | 60 | text-align: center; |
61 | margin: 20px 0 10px 0; | ||
59 | } | 62 | } |
60 | 63 | ||
61 | .mp_property | 64 | .mp_property |
@@ -83,7 +86,19 @@ POSSIBILITY OF SUCH DAMAGE. | |||
83 | .mp_property .hottext, | 86 | .mp_property .hottext, |
84 | .mp_property .hottextInput | 87 | .mp_property .hottextInput |
85 | { | 88 | { |
86 | width: 30px; | 89 | width: 23px; |
90 | } | ||
91 | |||
92 | .mp_property .hottext | ||
93 | { | ||
94 | color: white; | ||
95 | background: none; | ||
96 | } | ||
97 | |||
98 | .mp_property .hottextInput | ||
99 | { | ||
100 | color: black; | ||
101 | background: white; | ||
87 | } | 102 | } |
88 | 103 | ||
89 | .mp_property .button | 104 | .mp_property .button |
@@ -98,15 +113,26 @@ POSSIBILITY OF SUCH DAMAGE. | |||
98 | position: relative; | 113 | position: relative; |
99 | } | 114 | } |
100 | 115 | ||
116 | .mp_property .gradientpicker | ||
117 | { | ||
118 | top: 0; | ||
119 | } | ||
120 | |||
121 | .mp_property .gradientpicker .type | ||
122 | { | ||
123 | display: none; | ||
124 | } | ||
125 | |||
101 | .mp_properties_list | 126 | .mp_properties_list |
102 | { | 127 | { |
103 | padding-bottom: 8px; | 128 | padding-bottom: 8px; |
129 | padding-right: 20px; | ||
104 | } | 130 | } |
105 | 131 | ||
106 | .mp_properties_list > .mp_property > .colortoolbar | 132 | .mp_properties_list > .mp_property > .colortoolbar |
107 | { | 133 | { |
108 | width: 27px !important; | 134 | width: 27px !important; |
109 | height: 27px !important; | 135 | height: 27px !important; |
110 | overflow:hidden !important; | 136 | overflow:hidden !important; |
111 | margin-top: -6px; | 137 | margin-top: -6px; |
112 | } | 138 | } |
@@ -128,13 +154,28 @@ POSSIBILITY OF SUCH DAMAGE. | |||
128 | display: block; | 154 | display: block; |
129 | cursor: pointer; | 155 | cursor: pointer; |
130 | } | 156 | } |
157 | .mp_buttons button:hover, | ||
158 | .mp_buttons button:active { | ||
159 | color: white; | ||
160 | } | ||
131 | 161 | ||
132 | .mp_buttons .mp_cancel_btn { | 162 | .mp_buttons .mp_cancel_btn { |
133 | float: left; | 163 | float: left; |
134 | width: 60px; | 164 | width: 60px; |
135 | } | 165 | } |
136 | 166 | ||
167 | .mp_buttons .mp_saveAs_btn { | ||
168 | float: right; | ||
169 | width: 60px; | ||
170 | } | ||
171 | |||
137 | .mp_buttons .mp_ok_btn { | 172 | .mp_buttons .mp_ok_btn { |
138 | float: right; | 173 | float: right; |
139 | width: 30px; | 174 | width: 30px; |
175 | margin-left:4px; | ||
176 | } | ||
177 | |||
178 | .materials_popup .mp_reset_btn { | ||
179 | float: right; | ||
180 | margin-right: 8px; | ||
140 | } | 181 | } |
diff --git a/js/panels/Materials/materials-popup.reel/materials-popup.html b/js/panels/Materials/materials-popup.reel/materials-popup.html index b377fa2d..cd6a50fd 100755 --- a/js/panels/Materials/materials-popup.reel/materials-popup.html +++ b/js/panels/Materials/materials-popup.reel/materials-popup.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 |