aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Materials/materials-popup.reel
diff options
context:
space:
mode:
authorhwc4872012-07-09 16:08:02 -0700
committerhwc4872012-07-09 16:08:02 -0700
commit5085d0f67df89a21715308956004164597a6ba79 (patch)
tree2c896163143a66331205a39b0a3b1b45d51bf12a /js/panels/Materials/materials-popup.reel
parent51f1691f792dbda9b740ded8aa0457c9406db156 (diff)
parent84b3327bd92faafab7954b5eb64c7abe24a3fe13 (diff)
downloadninja-5085d0f67df89a21715308956004164597a6ba79.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into GridFixes
Conflicts: js/helper-classes/3D/StageLine.js
Diffstat (limited to 'js/panels/Materials/materials-popup.reel')
-rwxr-xr-xjs/panels/Materials/materials-popup.reel/materials-popup.css48
-rwxr-xr-xjs/panels/Materials/materials-popup.reel/materials-popup.html46
-rwxr-xr-xjs/panels/Materials/materials-popup.reel/materials-popup.js1148
3 files changed, 618 insertions, 624 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..03ea13cd 100755
--- a/js/panels/Materials/materials-popup.reel/materials-popup.css
+++ b/js/panels/Materials/materials-popup.reel/materials-popup.css
@@ -30,7 +30,8 @@ POSSIBILITY OF SUCH DAMAGE.
30</copyright> */ 30</copyright> */
31 31
32.materials_popup { 32.materials_popup {
33 width:400px; 33 width:auto;
34 min-width: 300px;
34 font-size: 12px; 35 font-size: 12px;
35 overflow: hidden; 36 overflow: hidden;
36 background: #494949; 37 background: #494949;
@@ -56,6 +57,7 @@ POSSIBILITY OF SUCH DAMAGE.
56.mp_preview { 57.mp_preview {
57 height: 100px; 58 height: 100px;
58 text-align: center; 59 text-align: center;
60 margin: 20px 0 10px 0;
59} 61}
60 62
61.mp_property 63.mp_property
@@ -83,7 +85,19 @@ POSSIBILITY OF SUCH DAMAGE.
83.mp_property .hottext, 85.mp_property .hottext,
84.mp_property .hottextInput 86.mp_property .hottextInput
85{ 87{
86 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;
87} 101}
88 102
89.mp_property .button 103.mp_property .button
@@ -98,15 +112,26 @@ POSSIBILITY OF SUCH DAMAGE.
98 position: relative; 112 position: relative;
99} 113}
100 114
115.mp_property .gradientpicker
116{
117 top: 0;
118}
119
120.mp_property .gradientpicker .type
121{
122 display: none;
123}
124
101.mp_properties_list 125.mp_properties_list
102{ 126{
103 padding-bottom: 8px; 127 padding-bottom: 8px;
128 padding-right: 20px;
104} 129}
105 130
106.mp_properties_list > .mp_property > .colortoolbar 131.mp_properties_list > .mp_property > .colortoolbar
107{ 132{
108 width: 27px !important; 133 width: 27px !important;
109 height: 27px !important; 134 height: 27px !important;
110 overflow:hidden !important; 135 overflow:hidden !important;
111 margin-top: -6px; 136 margin-top: -6px;
112} 137}
@@ -128,13 +153,28 @@ POSSIBILITY OF SUCH DAMAGE.
128 display: block; 153 display: block;
129 cursor: pointer; 154 cursor: pointer;
130} 155}
156.mp_buttons button:hover,
157.mp_buttons button:active {
158 color: white;
159}
131 160
132.mp_buttons .mp_cancel_btn { 161.mp_buttons .mp_cancel_btn {
133 float: left; 162 float: left;
134 width: 60px; 163 width: 60px;
135} 164}
136 165
166.mp_buttons .mp_saveAs_btn {
167 float: right;
168 width: 60px;
169}
170
137.mp_buttons .mp_ok_btn { 171.mp_buttons .mp_ok_btn {
138 float: right; 172 float: right;
139 width: 30px; 173 width: 30px;
174 margin-left:4px;
175}
176
177.materials_popup .mp_reset_btn {
178 float: right;
179 margin-right: 8px;
140} 180}
diff --git a/js/panels/Materials/materials-popup.reel/materials-popup.html b/js/panels/Materials/materials-popup.reel/materials-popup.html
index b377fa2d..ac8f0a94 100755
--- a/js/panels/Materials/materials-popup.reel/materials-popup.html
+++ b/js/panels/Materials/materials-popup.reel/materials-popup.html
@@ -1,4 +1,4 @@
1<!DOCTYPE html> 1<!doctype html>
2<!-- <copyright> 2<!-- <copyright>
3Copyright (c) 2012, Motorola Mobility, Inc 3Copyright (c) 2012, Motorola Mobility, Inc
4All Rights Reserved. 4All Rights Reserved.
@@ -29,13 +29,13 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
29POSSIBILITY OF SUCH DAMAGE. 29POSSIBILITY OF SUCH DAMAGE.
30</copyright> --> 30</copyright> -->
31<html lang="en"> 31<html lang="en">
32 <head> 32 <head>
33 33
34 <meta http-equiv="content-type" content="text/html; charset=utf-8" /> 34 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
35 35
36 <link rel="stylesheet" type="text/css" href="materials-popup.css"> 36 <link rel="stylesheet" type="text/css" href="materials-popup.css">
37 37
38 <script type="text/montage-serialization"> 38 <script type="text/montage-serialization">
39 { 39 {
40 "okButton": { 40 "okButton": {
41 "prototype": "montage/ui/button.reel", 41 "prototype": "montage/ui/button.reel",
@@ -51,6 +51,21 @@ POSSIBILITY OF SUCH DAMAGE.
51 "label": "Cancel" 51 "label": "Cancel"
52 } 52 }
53 }, 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 },
54 "eventDelegator": { 69 "eventDelegator": {
55 "prototype": "montage/core/event/action-event-listener", 70 "prototype": "montage/core/event/action-event-listener",
56 "properties": { 71 "properties": {
@@ -103,28 +118,35 @@ POSSIBILITY OF SUCH DAMAGE.
103 "element": {"#": "materials_popup"}, 118 "element": {"#": "materials_popup"},
104 "okButton": {"@": "okButton"}, 119 "okButton": {"@": "okButton"},
105 "cancelButton": {"@": "cancelButton"}, 120 "cancelButton": {"@": "cancelButton"},
106 "materialTitle": {"#": "mp_title"} 121 "saveAsButton": {"@": "saveAsButton"},
122 "resetButton": {"@": "resetButton"},
123 "materialTitle": {"#": "mp_title"},
124 "previewCanvas": {"#": "mp_preview_canvas"}
107 } 125 }
108 } 126 }
109 } 127 }
110 </script> 128 </script>
111 129
112 </head> 130 </head>
113 131
114 <body> 132 <body>
115 <div data-montage-id="materials_popup" class="materials_popup"> 133 <div data-montage-id="materials_popup" class="materials_popup">
116 <div data-montage-id="mp_title" class="mp_title">Material Name</div> 134 <div data-montage-id="mp_title" class="mp_title">Material Name</div>
117 <hr /> 135 <hr />
118 <div data-montage-id="mp_preview" class="mp_preview">Preview Pane</div> 136 <div data-montage-id="mp_preview" class="mp_preview">
137 <canvas data-montage-id="mp_preview_canvas" width="200" height="100"/>
138 </div>
119 <hr /> 139 <hr />
120 <div data-montage-id="mp_properties_list" class="mp_properties_list"> 140 <div data-montage-id="mp_properties_list" class="mp_properties_list">
121 <div data-montage-id="mp_property" class="mp_property"></div>