aboutsummaryrefslogtreecommitdiff
path: root/js/components/tools-properties/text-properties.reel
diff options
context:
space:
mode:
Diffstat (limited to 'js/components/tools-properties/text-properties.reel')
-rwxr-xr-xjs/components/tools-properties/text-properties.reel/text-properties.css1
-rwxr-xr-xjs/components/tools-properties/text-properties.reel/text-properties.html3
-rwxr-xr-xjs/components/tools-properties/text-properties.reel/text-properties.js1
3 files changed, 2 insertions, 3 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..d34968e5 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,6 @@
5 </copyright> */ 5 </copyright> */
6 6
7.optionsTextTool { 7.optionsTextTool {
8 padding: 6px;
9} 8}
10 9
11.optionsTextTool .btnGroup { 10.optionsTextTool .btnGroup {
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..8839ae94 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"},
@@ -303,7 +304,7 @@
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="fontColor"></div>
307 <div class="btnGroup"> 308 <div class="btnGroup">
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" style="font-weight: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" style="font-style: italic;"></button>
diff --git a/js/components/tools-properties/text-properties.reel/text-properties.js b/js/components/tools-properties/text-properties.reel/text-properties.js
index 88d38ffe..fa2ec066 100755
--- a/js/components/tools-properties/text-properties.reel/text-properties.js
+++ b/js/components/tools-properties/text-properties.reel/text-properties.js
@@ -202,7 +202,6 @@ exports.TextProperties = Montage.create(ToolProperties, {
202 if (!this.initialized) { 202 if (!this.initialized) {
203 203
204 //Setup Font Selection tool 204 //Setup Font Selection tool
205 this.fontColor = this.element.getElementsByClassName("fontColor")[0];
206 this.fontColor.props = {side: 'top', align: 'center', wheel: true, palette: true, gradient: false, image: false, nocolor: true, offset: -80}; 205 this.fontColor.props = {side: 'top', align: 'center', wheel: true, palette: true, gradient: false, image: false, nocolor: true, offset: -80};
207 this.application.ninja.colorController.addButton("chip", this.fontColor); 206 this.application.ninja.colorController.addButton("chip", this.fontColor);
208 this.fontColor.color('rgb', {wasSetByCode: true, type: 'change', color: {r: 0, g: 0, b: 0}, css: 'rgb(0,0,0)'}); 207 this.fontColor.color('rgb', {wasSetByCode: true, type: 'change', color: {r: 0, g: 0, b: 0}, css: 'rgb(0,0,0)'});