aboutsummaryrefslogtreecommitdiff
path: root/js/components/tools-properties
diff options
context:
space:
mode:
Diffstat (limited to 'js/components/tools-properties')
-rwxr-xr-xjs/components/tools-properties/text-properties.reel/text-properties.css27
-rwxr-xr-xjs/components/tools-properties/text-properties.reel/text-properties.html54
2 files changed, 43 insertions, 38 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 d34968e5..218105a7 100755
--- a/js/components/tools-properties/text-properties.reel/text-properties.css
+++ b/js/components/tools-properties/text-properties.reel/text-properties.css
@@ -7,6 +7,10 @@
7.optionsTextTool { 7.optionsTextTool {
8} 8}
9 9
10.optionsTextTool .overrideMargin{
11 margin-left: 0px;
12}
13
10.optionsTextTool .btnGroup { 14.optionsTextTool .btnGroup {
11 padding: 0px 8px; 15 padding: 0px 8px;
12} 16}
@@ -15,26 +19,27 @@
15 margin: 2px; 19 margin: 2px;
16} 20}
17 21
18.optionsTextTool > *, .optionsTextTool .btnGroup > * { 22.optionsTextTool .btnGroup .textButton {
19 float:left; 23 width: auto;
24 padding: 4px 8px;
25 margin-left: 0px;
20} 26}
21 27
22.optionsTextTool button { 28.optionsTextTool .btnGroup .imageButton {
23 width: auto; 29 padding-top: 2px;
24 padding: 4px 8px !important; 30 height: 22px;
25 margin-left:4px;
26} 31}
27 32
28.optionsTextTool .label, .optionsTextTool .hottextunit { 33.optionsTextTool .label, .optionsTextTool .hottextunit {
29 font-size:11px; 34 font-size:11px;
35 margin-top: 1px;
30} 36}
31 37
32.optionsTextTool .fontSelection { 38.optionsTextTool .fontSelection {
33 width:100px; 39 width: 160px;
34} 40}
35 41
36.optionsTextTool .fontColor { 42.optionsTextTool .toolColorChipCtrl {
37 width: 20px; 43 margin-left: 6px;
38 height: 18px; 44 margin-right: 0px;
39 margin: 2px 6px;
40} \ 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 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 18:05:36 +0000