diff options
author | hwc487 | 2012-05-17 11:06:20 -0700 |
---|---|---|
committer | hwc487 | 2012-05-17 11:06:20 -0700 |
commit | 0a3c703ce285941da20167a6d04b13b7eced23be (patch) | |
tree | e87019bcc3356c58dc93d982af2cfe16b582974b /js/components/tools-properties/text-properties.reel | |
parent | 1e649405d66f17d6acddb9055b181bba7ad70566 (diff) | |
parent | c37a876b373ddc7cb19277aaeaa6bb2d2d5a50ac (diff) | |
download | ninja-0a3c703ce285941da20167a6d04b13b7eced23be.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
Diffstat (limited to 'js/components/tools-properties/text-properties.reel')
3 files changed, 44 insertions, 40 deletions
diff --git a/js/components/tools-properties/text-properties.reel/text-properties.css b/js/components/tools-properties/text-properties.reel/text-properties.css index f7bb8295..218105a7 100755 --- a/js/components/tools-properties/text-properties.reel/text-properties.css +++ b/js/components/tools-properties/text-properties.reel/text-properties.css | |||
@@ -5,7 +5,10 @@ | |||
5 | </copyright> */ | 5 | </copyright> */ |
6 | 6 | ||
7 | .optionsTextTool { | 7 | .optionsTextTool { |
8 | padding: 6px; | 8 | } |
9 | |||
10 | .optionsTextTool .overrideMargin{ | ||
11 | margin-left: 0px; | ||
9 | } | 12 | } |
10 | 13 | ||
11 | .optionsTextTool .btnGroup { | 14 | .optionsTextTool .btnGroup { |
@@ -16,26 +19,27 @@ | |||
16 | margin: 2px; | 19 | margin: 2px; |
17 | } | 20 | } |
18 | 21 | ||
19 | .optionsTextTool > *, .optionsTextTool .btnGroup > * { | 22 | .optionsTextTool .btnGroup .textButton { |
20 | float:left; | 23 | width: auto; |
24 | padding: 4px 8px; | ||
25 | margin-left: 0px; | ||
21 | } | 26 | } |
22 | 27 | ||
23 | .optionsTextTool button { | 28 | .optionsTextTool .btnGroup .imageButton { |
24 | width: auto; | 29 | padding-top: 2px; |
25 | padding: 4px 8px !important; | 30 | height: 22px; |
26 | margin-left:4px; | ||
27 | } | 31 | } |
28 | 32 | ||
29 | .optionsTextTool .label, .optionsTextTool .hottextunit { | 33 | .optionsTextTool .label, .optionsTextTool .hottextunit { |
30 | font-size:11px; | 34 | font-size:11px; |
35 | margin-top: 1px; | ||
31 | } | 36 | } |
32 | 37 | ||
33 | .optionsTextTool .fontSelection { | 38 | .optionsTextTool .fontSelection { |
34 | width:100px; | 39 | width: 160px; |
35 | } | 40 | } |
36 | 41 | ||
37 | .optionsTextTool .fontColor { | 42 | .optionsTextTool .toolColorChipCtrl { |
38 | width: 20px; | 43 | margin-left: 6px; |
39 | height: 18px; | 44 | margin-right: 0px; |
40 | margin: 2px 6px; | ||
41 | } \ No newline at end of file | 45 | } \ No newline at end of file |
diff --git a/js/components/tools-properties/text-properties.reel/text-properties.html b/js/components/tools-properties/text-properties.reel/text-properties.html index 7fbec1da..725e1d22 100755 --- a/js/components/tools-properties/text-properties.reel/text-properties.html +++ b/js/components/tools-properties/text-properties.reel/text-properties.html | |||
@@ -21,6 +21,7 @@ | |||
21 | "fontSelection": {"@": "fontSelection"}, | 21 | "fontSelection": {"@": "fontSelection"}, |
22 | "fontSettings": {"@": "fontSettings"}, | 22 | "fontSettings": {"@": "fontSettings"}, |
23 | "fontSize": {"@": "fontSize"}, | 23 | "fontSize": {"@": "fontSize"}, |
24 | "fontColor": {"#": "fontColorCtrl"}, | ||
24 | "btnBold": {"@": "btnBold"}, | 25 | "btnBold": {"@": "btnBold"}, |
25 | "btnItalic": {"@": "btnItalic"}, | 26 | "btnItalic": {"@": "btnItalic"}, |
26 | "btnUnderline": {"@": "btnUnderline"}, | 27 | "btnUnderline": {"@": "btnUnderline"}, |
@@ -159,8 +160,8 @@ | |||
159 | "pressedClass": "active", | 160 | "pressedClass": "active", |
160 | "preventFocus": true, | 161 | "preventFocus": true, |
161 | "identifier": "alignLeft", | 162 | "identifier": "alignLeft", |
162 | "pressedLabel": "Left", | 163 | "pressedLabel": "", |
163 | "unpressedLabel": "Left" | 164 | "unpressedLabel": "" |
164 | }, | 165 | }, |
165 | "listeners": [ | 166 | "listeners": [ |
166 | { | 167 | { |
@@ -176,8 +177,8 @@ | |||
176 | "pressedClass": "active", | 177 | "pressedClass": "active", |
177 | "preventFocus": true, | 178 | "preventFocus": true, |
178 | "identifier": "alignCenter", | 179 | "identifier": "alignCenter", |
179 | "pressedLabel": "Center", | 180 | "pressedLabel": "", |
180 | "unpressedLabel": "Center" | 181 | "unpressedLabel": "" |
181 | }, | 182 | }, |
182 | "listeners": [ | 183 | "listeners": [ |
183 | { | 184 | { |
@@ -193,8 +194,8 @@ | |||
193 | "pressedClass": "active", | 194 | "pressedClass": "active", |
194 | "preventFocus": true, | 195 | "preventFocus": true, |
195 | "identifier": "alignRight", | 196 | "identifier": "alignRight", |
196 | "pressedLabel": "Right", | 197 | "pressedLabel": "", |
197 | "unpressedLabel": "Right" | 198 | "unpressedLabel": "" |
198 | }, | 199 | }, |
199 | "listeners": [ | 200 | "listeners": [ |
200 | { | 201 | { |
@@ -210,8 +211,8 @@ | |||
210 | "pressedClass": "active", | 211 | "pressedClass": "active", |
211 | "preventFocus": true, | 212 | "preventFocus": true, |
212 | "identifier": "alignJustify", | 213 | "identifier": "alignJustify", |
213 | "pressedLabel": "Justify", | 214 | "pressedLabel": "", |
214 | "unpressedLabel": "Justify" | 215 | "unpressedLabel": "" |
215 | }, | 216 | }, |
216 | "listeners": [ | 217 | "listeners": [ |
217 | { | 218 | { |
@@ -293,36 +294,36 @@ | |||
293 | </head> | 294 | </head> |
294 | 295 | ||
295 | <body> | 296 | <body> |
296 | <div data-montage-id="textProperties" class="subToolHolderPanel optionsTextTool"> | 297 | <div data-montage-id="textProperties" class="subToolHolderPanel optionsTextTool toolOptionsFloatChildren"> |
297 | <label class="label" style="display: none">Class:</label> | 298 | <label class="label" style="display: none">Class:</label> |
298 | <input data-montage-id="className" style="display: none" /> | 299 | <input data-montage-id="className" style="display: none" /> |
299 | <label class="label" style="display: none">Tag:</label> | 300 | <label class="label" style="display: none">Tag:</label> |
300 | <select data-montage-id="tagType" style="display: none"></select> | 301 | <select data-montage-id="tagType" style="display: none"></select> |
301 | <label class="label">Font:</label> | 302 | <label class="label overrideMargin">Font:</label> |
302 | <select data-montage-id="fontSelection" class="nj-skinned fontSelection"></select> | 303 | <select data-montage-id="fontSelection" class="nj-skinned fontSelection"></select> |
303 | <button data-montage-id="fontSettings" style="display: none"></button> | 304 | <button data-montage-id="fontSettings" style="display: none"></button> |
304 | <label class="label">Size:</label> | 305 | <label class="label">Size:</label> |
305 | <select data-montage-id="fontSize" class="nj-skinned"></select> | 306 | <select data-montage-id="fontSize" class="nj-skinned"></select> |
306 | <div class="fontColor"></div> | 307 | <div data-montage-id="fontColorCtrl" class="toolColorChipCtrl"></div> |
307 | <div class="btnGroup"> | 308 | <div class="btnGroup toolOptionsFloatChildren"> |
308 | <button data-montage-id="btnBold" class="btnBold nj-skinned" style="font-weight:bold"></button> | 309 | <button data-montage-id="btnBold" class="btnBold nj-skinned textButton" style="font-weight:bold" title="Bold"></button> |
309 | <button data-montage-id="btnItalic" class="btnItalic nj-skinned" style="font-style: italic;"></button> | 310 | <button data-montage-id="btnItalic" class="btnItalic nj-skinned textButton" style="font-style: italic;"></button> |
310 | <button data-montage-id="btnUnderline" class="btnUnderline nj-skinned" style="text-decoration: underline;"></button> | 311 | <button data-montage-id="btnUnderline" class="btnUnderline nj-skinned textButton" style="text-decoration: underline;"></button> |
311 | <button data-montage-id="btnStrikethrough" class="btnStriketrough nj-skinned" style="text-decoration: line-through;"></button> | 312 | <button data-montage-id="btnStrikethrough" class="btnStriketrough nj-skinned textButton" style="text-decoration: line-through;"></button> |
312 | </div> | 313 | </div> |
313 | <div class="btnGroup"> | 314 | <div class="btnGroup toolOptionsFloatChildren"> |
314 | <button data-montage-id="alignLeft" class="nj-skinned"></button> | 315 | <button data-montage-id="alignLeft" class="nj-skinned imageButton"><img src="../../../../images/optionsbar/text/AlignLeft.png" class="unselectable"/></button> |
315 | <button data-montage-id="alignCenter" class="nj-skinned"></button> | 316 | <button data-montage-id="alignCenter" class="nj-skinned imageButton"><img src="../../../../images/optionsbar/text/AlignCenter.png" class="unselectable"/></button> |
316 | <button data-montage-id="alignRight" class="nj-skinned"></button> | 317 | <button data-montage-id="alignRight" class="nj-skinned imageButton"><img src="../../../../images/optionsbar/text/AlignRight.png" class="unselectable"/></button> |
317 | <button data-montage-id="alignJustify" class="nj-skinned"></button> | 318 | <button data-montage-id="alignJustify" class="nj-skinned imageButton"><img src="../../../../images/optionsbar/text/AlignJustified.png" class="unselectable"/></button> |
318 | </div> | 319 | </div> |
319 | <div class="btnGroup"> | 320 | <div class="btnGroup toolOptionsFloatChildren"> |
320 | <button data-montage-id="indent" class="nj-skinned"></button> | 321 | <button data-montage-id="indent" class="nj-skinned textButton"></button> |
321 | <button data-montage-id="outdent" class="nj-skinned"></button> | 322 | <button data-montage-id="outdent" class="nj-skinned textButton"></button> |
322 | </div> | 323 | </div> |
323 | <div class="btnGroup"> | 324 | <div class="btnGroup toolOptionsFloatChildren"> |
324 | <button data-montage-id="bulletedList" class="nj-skinned"></button> | 325 | <button data-montage-id="bulletedList" class="nj-skinned imageButton"><img src="../../../../images/optionsbar/text/BulletedList.png" /></button> |
325 | <button data-montage-id="numberedList" class="nj-skinned"></button> | 326 | <button data-montage-id="numberedList" class="nj-skinned imageButton"><img src="../../../../images/optionsbar/text/NumberedList.png" /></button> |
326 | </div> | 327 | </div> |