aboutsummaryrefslogtreecommitdiff
path: root/js/components/tools-properties/text-properties.reel/text-properties.html
diff options
context:
space:
mode:
authorValerio Virgillito2012-02-15 16:09:47 -0800
committerValerio Virgillito2012-02-15 16:09:47 -0800
commitd366c0bd1af6471511217ed574083e15059519b5 (patch)
treec8c9f9af761457e3c5f4c6774fb0fbba851df0c4 /js/components/tools-properties/text-properties.reel/text-properties.html
parent997ce3fb65f27b3d6f331f63b5dc22d3c7fb8f1e (diff)
parentb85bfb54aaca3ccca3c1ef09115de925cd67f4e9 (diff)
downloadninja-d366c0bd1af6471511217ed574083e15059519b5.tar.gz
Merge branch 'refs/heads/integration'
Diffstat (limited to 'js/components/tools-properties/text-properties.reel/text-properties.html')
-rwxr-xr-x[-rw-r--r--]js/components/tools-properties/text-properties.reel/text-properties.html8
1 files changed, 4 insertions, 4 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 7ded1236..a7d2af10 100644..100755
--- a/js/components/tools-properties/text-properties.reel/text-properties.html
+++ b/js/components/tools-properties/text-properties.reel/text-properties.html
@@ -236,7 +236,7 @@
236 "element": {"#": "indent"}, 236 "element": {"#": "indent"},
237 "pressedClass": "active", 237 "pressedClass": "active",
238 "preventFocus": true, 238 "preventFocus": true,
239 "identifier": "outdent", 239 "identifier": "indent",
240 "label": ">>" 240 "label": ">>"
241 }, 241 },
242 "listeners": [ 242 "listeners": [
@@ -253,7 +253,7 @@
253 "element": {"#": "outdent"}, 253 "element": {"#": "outdent"},
254 "pressedClass": "active", 254 "pressedClass": "active",
255 "preventFocus": true, 255 "preventFocus": true,
256 "identifier": "<<", 256 "identifier": "outdent",
257 "label": "<<" 257 "label": "<<"
258 }, 258 },
259 "listeners": [ 259 "listeners": [
@@ -310,10 +310,10 @@
310 <label class="label" style="display: none">Tag:</label> 310 <label class="label" style="display: none">Tag:</label>
311 <select id="tagType" style="display: none"></select> 311 <select id="tagType" style="display: none"></select>
312 <label class="label">Font:</label> 312 <label class="label">Font:</label>
313 <select id="fontSelection" class="fontSelection"></select> 313 <select id="fontSelection" class="nj-skinned fontSelection"></select>
314 <button id="fontSettings" style="display: none"></button> 314 <button id="fontSettings" style="display: none"></button>
315 <label class="label">Size:</label> 315 <label class="label">Size:</label>
316 <input id="fontSize"/> 316 <select id="fontSize" class="nj-skinned"></select>
317 <div class="fontColor"></div> 317 <div class="fontColor"></div>
318 <div class="btnGroup"> 318 <div class="btnGroup">
319 <button id="btnBold" class="btnBold nj-skinned" style="font-weight:bold"></button> 319 <button id="btnBold" class="btnBold nj-skinned" style="font-weight:bold"></button>