diff options
author | John Mayhew | 2012-05-15 17:07:22 -0700 |
---|---|---|
committer | John Mayhew | 2012-05-15 17:08:01 -0700 |
commit | 67e39072da76ac79955e8c2c001e17b01311d313 (patch) | |
tree | 3e230f97feabd94a3d1281076a4c2c00b5a08eda /js/components/tools-properties/text-properties.reel/text-properties.html | |
parent | 9539e778dd678cec90cf83528df69a189be3a192 (diff) | |
download | ninja-67e39072da76ac79955e8c2c001e17b01311d313.tar.gz |
-added new images for the text tool options
-simplified text options CSS
-fixed styling to accommodate new images
Diffstat (limited to 'js/components/tools-properties/text-properties.reel/text-properties.html')
-rwxr-xr-x | js/components/tools-properties/text-properties.reel/text-properties.html | 54 |
1 files changed, 27 insertions, 27 deletions
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 8839ae94..725e1d22 100755 --- a/js/components/tools-properties/text-properties.reel/text-properties.html +++ b/js/components/tools-properties/text-properties.reel/text-properties.html | |||
@@ -160,8 +160,8 @@ | |||
160 | "pressedClass": "active", | 160 | "pressedClass": "active", |
161 | "preventFocus": true, | 161 | "preventFocus": true, |
162 | "identifier": "alignLeft", | 162 | "identifier": "alignLeft", |
163 | "pressedLabel": "Left", | 163 | "pressedLabel": "", |
164 | "unpressedLabel": "Left" | 164 | "unpressedLabel": "" |
165 | }, | 165 | }, |
166 | "listeners": [ | 166 | "listeners": [ |
167 | { | 167 | { |
@@ -177,8 +177,8 @@ | |||
177 | "pressedClass": "active", | 177 | "pressedClass": "active", |
178 | "preventFocus": true, | 178 | "preventFocus": true, |
179 | "identifier": "alignCenter", | 179 | "identifier": "alignCenter", |
180 | "pressedLabel": "Center", | 180 | "pressedLabel": "", |
181 | "unpressedLabel": "Center" | 181 | "unpressedLabel": "" |
182 | }, | 182 | }, |
183 | "listeners": [ | 183 | "listeners": [ |
184 | { | 184 | { |
@@ -194,8 +194,8 @@ | |||
194 | "pressedClass": "active", | 194 | "pressedClass": "active", |
195 | "preventFocus": true, | 195 | "preventFocus": true, |
196 | "identifier": "alignRight", | 196 | "identifier": "alignRight", |
197 | "pressedLabel": "Right", | 197 | "pressedLabel": "", |
198 | "unpressedLabel": "Right" | 198 | "unpressedLabel": "" |
199 | }, | 199 | }, |
200 | "listeners": [ | 200 | "listeners": [ |
201 | { | 201 | { |
@@ -211,8 +211,8 @@ | |||
211 | "pressedClass": "active", | 211 | "pressedClass": "active", |
212 | "preventFocus": true, | 212 | "preventFocus": true, |
213 | "identifier": "alignJustify", | 213 | "identifier": "alignJustify", |
214 | "pressedLabel": "Justify", | 214 | "pressedLabel": "", |
215 | "unpressedLabel": "Justify" | 215 | "unpressedLabel": "" |
216 | }, | 216 | }, |
217 | "listeners": [ | 217 | "listeners": [ |
218 | { | 218 | { |
@@ -294,36 +294,36 @@ | |||
294 | </head> | 294 | </head> |
295 | 295 | ||
296 | <body> | 296 | <body> |
297 | <div data-montage-id="textProperties" class="subToolHolderPanel optionsTextTool"> | 297 | <div data-montage-id="textProperties" class="subToolHolderPanel optionsTextTool toolOptionsFloatChildren"> |
298 | <label class="label" style="display: none">Class:</label> | 298 | <label class="label" style="display: none">Class:</label> |
299 | <input data-montage-id="className" style="display: none" /> | 299 | <input data-montage-id="className" style="display: none" /> |
300 | <label class="label" style="display: none">Tag:</label> | 300 | <label class="label" style="display: none">Tag:</label> |
301 | <select data-montage-id="tagType" style="display: none"></select> | 301 | <select data-montage-id="tagType" style="display: none"></select> |
302 | <label class="label">Font:</label> | 302 | <label class="label overrideMargin">Font:</label> |
303 | <select data-montage-id="fontSelection" class="nj-skinned fontSelection"></select> | 303 | <select data-montage-id="fontSelection" class="nj-skinned fontSelection"></select> |
304 | <button data-montage-id="fontSettings" style="display: none"></button> | 304 | <button data-montage-id="fontSettings" style="display: none"></button> |
305 | <label class="label">Size:</label> | 305 | <label class="label">Size:</label> |
306 | <select data-montage-id="fontSize" class="nj-skinned"></select> | 306 | <select data-montage-id="fontSize" class="nj-skinned"></select> |
307 | <div data-montage-id="fontColorCtrl" class="fontColor"></div> | 307 | <div data-montage-id="fontColorCtrl" class="toolColorChipCtrl"></div> |
308 | <div class="btnGroup"> | 308 | <div class="btnGroup toolOptionsFloatChildren"> |
309 | <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> |
310 | <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> |
311 | <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> |
312 | <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> |
313 | </div> | 313 | </div> |
314 | <div class="btnGroup"> | 314 | <div class="btnGroup toolOptionsFloatChildren"> |
315 | <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> |
316 | <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> |
317 | <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> |
318 | <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> |
319 | </div> | 319 | </div> |
320 | <div class="btnGroup"> | 320 | <div class="btnGroup toolOptionsFloatChildren"> |
321 | <button data-montage-id="indent" class="nj-skinned"></button> | 321 | <button data-montage-id="indent" class="nj-skinned textButton"></button> |
322 | <button data-montage-id="outdent" class="nj-skinned"></button> | 322 | <button data-montage-id="outdent" class="nj-skinned textButton"></button> |
323 | </div> | 323 | </div> |
324 | <div class="btnGroup"> | 324 | <div class="btnGroup toolOptionsFloatChildren"> |
325 | <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> |
326 | <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> |
327 | </div> | 327 | </div> |
328 | </div> | 328 | </div> |
329 | </body> | 329 | </body> |