aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Materials/materials-popup.reel
diff options
context:
space:
mode:
Diffstat (limited to 'js/panels/Materials/materials-popup.reel')
-rwxr-xr-xjs/panels/Materials/materials-popup.reel/materials-popup.css76
-rwxr-xr-xjs/panels/Materials/materials-popup.reel/materials-popup.html60
-rwxr-xr-xjs/panels/Materials/materials-popup.reel/materials-popup.js470
3 files changed, 336 insertions, 270 deletions
diff --git a/js/panels/Materials/materials-popup.reel/materials-popup.css b/js/panels/Materials/materials-popup.reel/materials-popup.css
index 943d9bcb..d53cb795 100755
--- a/js/panels/Materials/materials-popup.reel/materials-popup.css
+++ b/js/panels/Materials/materials-popup.reel/materials-popup.css
@@ -1,12 +1,37 @@
1@charset "UTF-8"; 1@charset "UTF-8";
2/* <copyright> 2/* <copyright>
3 This file contains proprietary software owned by Motorola Mobility, Inc.<br/> 3Copyright (c) 2012, Motorola Mobility, Inc
4 No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> 4All Rights Reserved.
5 (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. 5BSD License.
6 </copyright> */ 6
7Redistribution and use in source and binary forms, with or without
8modification, are permitted provided that the following conditions are met:
9
10 - Redistributions of source code must retain the above copyright notice,
11 this list of conditions and the following disclaimer.
12 - Redistributions in binary form must reproduce the above copyright
13 notice, this list of conditions and the following disclaimer in the
14 documentation and/or other materials provided with the distribution.
15 - Neither the name of Motorola Mobility nor the names of its contributors
16 may be used to endorse or promote products derived from this software
17 without specific prior written permission.
18
19THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
20AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
21IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
22ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
23LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
24CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
25SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
26INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
27CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
28ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
29POSSIBILITY OF SUCH DAMAGE.
30</copyright> */
7 31
8.materials_popup { 32.materials_popup {
9 width:400px; 33 width:auto;
34 min-width: 300px;
10 font-size: 12px; 35 font-size: 12px;
11 overflow: hidden; 36 overflow: hidden;
12 background: #494949; 37 background: #494949;
@@ -32,6 +57,7 @@
32.mp_preview { 57.mp_preview {
33 height: 100px; 58 height: 100px;
34 text-align: center; 59 text-align: center;
60 margin: 20px 0 10px 0;
35} 61}
36 62
37.mp_property 63.mp_property
@@ -59,7 +85,19 @@
59.mp_property .hottext, 85.mp_property .hottext,
60.mp_property .hottextInput 86.mp_property .hottextInput
61{ 87{
62 width: 30px; 88 width: 23px;
89}
90
91.mp_property .hottext
92{
93 color: white;
94 background: none;
95}
96
97.mp_property .hottextInput
98{
99 color: black;
100 background: white;
63} 101}
64 102
65.mp_property .button 103.mp_property .button
@@ -74,9 +112,20 @@
74 position: relative; 112 position: relative;
75} 113}
76 114
115.mp_property .gradientpicker
116{
117 top: 0;
118}
119
120.mp_property .gradientpicker .type
121{
122 display: none;
123}
124
77.mp_properties_list 125.mp_properties_list
78{ 126{
79 padding-bottom: 8px; 127 padding-bottom: 8px;
128 padding-right: 20px;
80} 129}
81 130
82.mp_properties_list > .mp_property > .colortoolbar 131.mp_properties_list > .mp_property > .colortoolbar
@@ -104,13 +153,28 @@
104 display: block; 153 display: block;
105 cursor: pointer; 154 cursor: pointer;
106} 155}
156.mp_buttons button:hover,
157.mp_buttons button:active {
158 color: white;
159}
107 160
108.mp_buttons .mp_cancel_btn { 161.mp_buttons .mp_cancel_btn {
109 float: left; 162 float: left;
110 width: 60px; 163 width: 60px;
111} 164}
112 165
166.mp_buttons .mp_saveAs_btn {
167 float: right;
168 width: 60px;
169}
170
113.mp_buttons .mp_ok_btn { 171.mp_buttons .mp_ok_btn {
114 float: right; 172 float: right;
115 width: 30px; 173 width: 30px;
174 margin-left:4px;
175}
176
177.materials_popup .mp_reset_btn {
178 float: right;
179 margin-right: 8px;
116} \ No newline at end of file 180} \ No newline at end of file
diff --git a/js/panels/Materials/materials-popup.reel/materials-popup.html b/js/panels/Materials/materials-popup.reel/materials-popup.html
index bac722cd..db53e0e9 100755
--- a/js/panels/Materials/materials-popup.reel/materials-popup.html
+++ b/js/panels/Materials/materials-popup.reel/materials-popup.html
@@ -1,9 +1,33 @@
1<!DOCTYPE html> 1<!DOCTYPE html>
2<!-- <copyright> 2<!-- <copyright>
3 This file contains proprietary software owned by Motorola Mobility, Inc.<br/> 3Copyright (c) 2012, Motorola Mobility, Inc
4 No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> 4All Rights Reserved.
5 (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. 5BSD License.
6 </copyright> --> 6
7Redistribution and use in source and binary forms, with or without
8modification, are permitted provided that the following conditions are met:
9
10 - Redistributions of source code must retain the above copyright notice,
11 this list of conditions and the following disclaimer.
12 - Redistributions in binary form must reproduce the above copyright
13 notice, this list of conditions and the following disclaimer in the
14 documentation and/or other materials provided with the distribution.
15 - Neither the name of Motorola Mobility nor the names of its contributors
16 may be used to endorse or promote products derived from this software
17 without specific prior written permission.
18
19THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
20AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
21IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
22ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
23LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
24CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
25SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
26INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
27CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
28ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
29POSSIBILITY OF SUCH DAMAGE.
30</copyright> -->
7<html lang="en"> 31<html lang="en">
8 <head> 32 <head>
9 33
@@ -27,6 +51,21 @@
27 "label": "Cancel" 51 "label": "Cancel"
28 } 52 }
29 }, 53 },
54 "saveAsButton": {
55 "prototype": "montage/ui/button.reel",
56 "properties": {
57 "element": {"#": "mp_saveAs_btn"},
58 "label": "Save As..."
59 }
60 },
61 "resetButton": {
62 "prototype": "montage/ui/button.reel",
63 "properties": {
64 "element": {"#": "mp_reset_btn"},
65 "label": "Reset",
66 "enabled": false
67 }
68 },
30 "eventDelegator": { 69 "eventDelegator": {
31 "prototype": "montage/core/event/action-event-listener", 70 "prototype": "montage/core/event/action-event-listener",
32 "properties": { 71 "properties": {
@@ -79,7 +118,10 @@
79 "element": {"#": "materials_popup"}, 118 "element": {"#": "materials_popup"},
80 "okButton": {"@": "okButton"},