aboutsummaryrefslogtreecommitdiff
path: root/js/components
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-06-21 16:54:18 -0700
committerJose Antonio Marquez2012-06-21 16:54:18 -0700
commitd6360c39f6cd90dd5e9a1d5ef5bd5211641dad42 (patch)
tree564528119093e4e3408ccf180d55ac3d5e413813 /js/components
parentbf6bed611714053aabc0d38978bddd62873d04aa (diff)
parent2af33f19de48bb8fe269c51ceddd1bc1f591651f (diff)
downloadninja-d6360c39f6cd90dd5e9a1d5ef5bd5211641dad42.tar.gz
Merge branch 'refs/heads/Ninja-Internal' into FileIO
Diffstat (limited to 'js/components')
-rwxr-xr-xjs/components/tools-properties/brush-properties.reel/brush-properties.html2
-rwxr-xr-xjs/components/tools-properties/fill-properties.reel/fill-properties.html2
-rwxr-xr-xjs/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html2
-rwxr-xr-xjs/components/tools-properties/pen-properties.reel/pen-properties.html4
-rwxr-xr-xjs/components/tools-properties/shape-properties.reel/shape-properties.html5
-rwxr-xr-xjs/components/tools-properties/shape-properties.reel/shape-properties.js8
-rwxr-xr-xjs/components/tools-properties/tag-properties.reel/tag-properties.html2
-rwxr-xr-xjs/components/tools-properties/text-properties.reel/text-properties.css4
-rwxr-xr-xjs/components/tools-properties/text-properties.reel/text-properties.html2
9 files changed, 16 insertions, 15 deletions
diff --git a/js/components/tools-properties/brush-properties.reel/brush-properties.html b/js/components/tools-properties/brush-properties.reel/brush-properties.html
index 7d99a42a..8753e921 100755
--- a/js/components/tools-properties/brush-properties.reel/brush-properties.html
+++ b/js/components/tools-properties/brush-properties.reel/brush-properties.html
@@ -82,7 +82,7 @@
82 <body> 82 <body>
83 <div data-montage-id="brushProperties" class="subToolHolderPanel toolOptionsFloatChildren"> 83 <div data-montage-id="brushProperties" class="subToolHolderPanel toolOptionsFloatChildren">
84 <div class="toolColorChipIcon FillTool"></div> 84 <div class="toolColorChipIcon FillTool"></div>
85 <div data-montage-id="fillColorCtrl" class="toolColorChipCtrl"></div> 85 <div class="toolColorChipContainer"><div data-montage-id="fillColorCtrl" class="toolColorChipCtrl"></div></div>
86 <div class="nj-divider divider-vertical">&nbsp;</div> 86 <div class="nj-divider divider-vertical">&nbsp;</div>
87 <label class="label"> Width:</label> 87 <label class="label"> Width:</label>
88 <div data-montage-id="strokeSize" class="label"></div> 88 <div data-montage-id="strokeSize" class="label"></div>
diff --git a/js/components/tools-properties/fill-properties.reel/fill-properties.html b/js/components/tools-properties/fill-properties.reel/fill-properties.html
index cf68520f..e5df9bd3 100755
--- a/js/components/tools-properties/fill-properties.reel/fill-properties.html
+++ b/js/components/tools-properties/fill-properties.reel/fill-properties.html
@@ -66,7 +66,7 @@
66 <div data-montage-id="fillProperties" class="subToolHolderPanel optionsFillTool toolOptionsFloatChildren"> 66 <div data-montage-id="fillProperties" class="subToolHolderPanel optionsFillTool toolOptionsFloatChildren">
67 <input data-montage-id="useFillColor" type="checkbox" name="useFillColorControl" class="nj-skinned"/> 67 <input data-montage-id="useFillColor" type="checkbox" name="useFillColorControl" class="nj-skinned"/>
68 <div class="toolColorChipIcon FillTool"></div> 68 <div class="toolColorChipIcon FillTool"></div>
69 <div data-montage-id="fillColorCtrl" class="toolColorChipCtrl"></div> 69 <div class="toolColorChipContainer"><div data-montage-id="fillColorCtrl" class="toolColorChipCtrl"></div></div>
70 <div class="nj-divider divider-vertical toolOptionsSpacer">&nbsp;</div> 70 <div class="nj-divider divider-vertical toolOptionsSpacer">&nbsp;</div>
71 71
72 <input data-montage-id="useWebGL" type="checkbox" name="useWebGLControl" class="nj-skinned"/> 72 <input data-montage-id="useWebGL" type="checkbox" name="useWebGLControl" class="nj-skinned"/>
diff --git a/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html b/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html
index 579930f0..c7fcc523 100755
--- a/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html
+++ b/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html
@@ -151,7 +151,7 @@
151 151
152 <input data-montage-id="useStrokeColor" type="checkbox" name="useStrokeColor" class="nj-skinned" title="Apply stroke or border-color"/> 152 <input data-montage-id="useStrokeColor" type="checkbox" name="useStrokeColor" class="nj-skinned" title="Apply stroke or border-color"/>
153 <div class="toolColorChipIcon PencilTool"></div> 153 <div class="toolColorChipIcon PencilTool"></div>
154 <div data-montage-id="strokeColorCtrl" class="toolColorChipCtrl"></div> 154 <div class="toolColorChipContainer"><div data-montage-id="strokeColorCtrl" class="toolColorChipCtrl"></div></div>
155 <div class="nj-divider divider-vertical toolOptionsSpacer">&nbsp;</div> 155 <div class="nj-divider divider-vertical toolOptionsSpacer">&nbsp;</div>
156 156
157 <input data-montage-id="useBorderWidth" type="checkbox" name="useBorderWidthControl" class="nj-skinned" title="Apply border-width"/> 157 <input data-montage-id="useBorderWidth" type="checkbox" name="useBorderWidthControl" class="nj-skinned" title="Apply border-width"/>
diff --git a/js/components/tools-properties/pen-properties.reel/pen-properties.html b/js/components/tools-properties/pen-properties.reel/pen-properties.html
index adb5cd7d..c77ac660 100755
--- a/js/components/tools-properties/pen-properties.reel/pen-properties.html
+++ b/js/components/tools-properties/pen-properties.reel/pen-properties.html
@@ -51,9 +51,9 @@
51 <div class="nj-divider divider-vertical toolOptionsSpacer">&nbsp;</div> 51 <div class="nj-divider divider-vertical toolOptionsSpacer">&nbsp;</div>
52 52
53 <div class="toolColorChipIcon PencilTool"></div> 53 <div class="toolColorChipIcon PencilTool"></div>
54 <div data-montage-id="strokeColorCtrl" class="toolColorChipCtrl"></div> 54 <div class="toolColorChipContainer"><div data-montage-id="strokeColorCtrl" class="toolColorChipCtrl"></div></div>
55 <div class="toolColorChipIcon FillTool"></div> 55 <div class="toolColorChipIcon FillTool"></div>
56 <div data-montage-id="fillColorCtrl" class="toolColorChipCtrl"></div> 56 <div class="toolColorChipContainer"><div data-montage-id="fillColorCtrl" class="toolColorChipCtrl"></div></div>
57 <div class="nj-divider divider-vertical">&nbsp;</div> 57 <div class="nj-divider divider-vertical">&nbsp;</div>
58 <label class="label"> Stroke:</label> 58 <label class="label"> Stroke:</label>
59 <div data-montage-id="strokeSize" class="label"></div> 59 <div data-montage-id="strokeSize" class="label"></div>
diff --git a/js/components/tools-properties/shape-properties.reel/shape-properties.html b/js/components/tools-properties/shape-properties.reel/shape-properties.html
index ea246ea8..5f93b556 100755
--- a/js/components/tools-properties/shape-properties.reel/shape-properties.html
+++ b/js/components/tools-properties/shape-properties.reel/shape-properties.html
@@ -112,6 +112,7 @@
112 "_fillColorCtrlIcon": {"#": "fillColorCtrlIcon"}, 112 "_fillColorCtrlIcon": {"#": "fillColorCtrlIcon"},
113 "_fillColorCtrl": {"#": "fillColorCtrl"}, 113 "_fillColorCtrl": {"#": "fillColorCtrl"},
114 "_strokeColorCtrl": {"#": "strokeColorCtrl"}, 114 "_strokeColorCtrl": {"#": "strokeColorCtrl"},
115 "_fillColorCtrlContainer": {"#": "fillColorCtrlContainer"},
115 116
116 "_strokeSize": {"@": "_strokeSize1"}, 117 "_strokeSize": {"@": "_strokeSize1"},
117 "ovalProperties": {"@": "ovalProperties1"}, 118 "ovalProperties": {"@": "ovalProperties1"},
@@ -135,9 +136,9 @@
135 </div> 136 </div>
136 <div class="nj-divider divider-vertical toolOptionsSpacer">&nbsp;</div> 137 <div class="nj-divider divider-vertical toolOptionsSpacer">&nbsp;</div>
137 <div class="toolColorChipIcon PencilTool"></div> 138 <div class="toolColorChipIcon PencilTool"></div>
138 <div data-montage-id="strokeColorCtrl" class="toolColorChipCtrl"></div> 139 <div class="toolColorChipContainer"><div data-montage-id="strokeColorCtrl" class="toolColorChipCtrl"></div></div>
139 <div data-montage-id="fillColorCtrlIcon" class="toolColorChipIcon FillTool"></div> 140 <div data-montage-id="fillColorCtrlIcon" class="toolColorChipIcon FillTool"></div>
140 <div data-montage-id="fillColorCtrl" class="toolColorChipCtrl"></div> 141 <div data-montage-id="fillColorCtrlContainer" class="toolColorChipContainer"><div data-montage-id="fillColorCtrl" class="toolColorChipCtrl"></div></div>
141 <div class="nj-divider divider-vertical">&nbsp;</div> 142 <div class="nj-divider divider-vertical">&nbsp;</div>
142 <label class="label">Stroke:</label> 143 <label class="label">Stroke:</label>
143 <div data-montage-id="strokeControl" class="label"></div> 144 <div data-montage-id="strokeControl" class="label"></div>
diff --git a/js/components/tools-properties/shape-properties.reel/shape-properties.js b/js/components/tools-properties/shape-properties.reel/shape-properties.js
index 5829634c..7306275a 100755
--- a/js/components/tools-properties/shape-properties.reel/shape-properties.js
+++ b/js/components/tools-properties/shape-properties.reel/shape-properties.js
@@ -179,14 +179,14 @@ var ShapeProperties = exports.ShapeProperties = Montage.create(ToolProperties, {
179 this[this._selectedSubTool.properties].visible = true; 179 this[this._selectedSubTool.properties].visible = true;
180 180
181 if (this._selectedSubTool.id === "LineTool") { 181 if (this._selectedSubTool.id === "LineTool") {
182 this._fillColorCtrl.style["display"] = "none"; 182 this._fillColorCtrlContainer.style["display"] = "none";
183 this._fillColorCtrl.visible = false; 183 this._fillColorCtrlContainer.visible = false;
184 this._fillColorCtrlIcon.style["display"] = "none"; 184 this._fillColorCtrlIcon.style["display"] = "none";
185 this._fillColorCtrlIcon.visible = false; 185 this._fillColorCtrlIcon.visible = false;
186 this.endDivider.style["display"] = "none"; 186 this.endDivider.style["display"] = "none";
187 } else { 187 } else {
188 this._fillColorCtrl.style["display"] = ""; 188 this._fillColorCtrlContainer.style["display"] = "";
189 this._fillColorCtrl.visible = true; 189 this._fillColorCtrlContainer.visible = true;
190 this._fillColorCtrlIcon.style["display"] = ""; 190 this._fillColorCtrlIcon.style["display"] = "";
191 this._fillColorCtrlIcon.visible = true; 191 this._fillColorCtrlIcon.visible = true;
192 this.endDivider.style["display"] = ""; 192 this.endDivider.style["display"] = "";
diff --git a/js/components/tools-properties/tag-properties.reel/tag-properties.html b/js/components/tools-properties/tag-properties.reel/tag-properties.html
index 87f87aff..082384db 100755
--- a/js/components/tools-properties/tag-properties.reel/tag-properties.html
+++ b/js/components/tools-properties/tag-properties.reel/tag-properties.html
@@ -48,7 +48,7 @@
48 <div class="nj-divider divider-vertical toolOptionsSpacer">&nbsp;</div> 48 <div class="nj-divider divider-vertical toolOptionsSpacer">&nbsp;</div>
49 49
50 <div class="toolColorChipIcon FillTool"></div> 50 <div class="toolColorChipIcon FillTool"></div>
51 <div data-montage-id="fillColorCtrl" class="toolColorChipCtrl"></div> 51 <div class="toolColorChipContainer"><div data-montage-id="fillColorCtrl" class="toolColorChipCtrl"></div></div>
52 <div class="nj-divider divider-vertical toolOptionsSpacer">&nbsp;</div> 52 <div class="nj-divider divider-vertical toolOptionsSpacer">&nbsp;</div>
53 53
54 <div id="classNameContainer"> 54 <div id="classNameContainer">
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 218105a7..586cdcd5 100755
--- a/js/components/tools-properties/text-properties.reel/text-properties.css
+++ b/js/components/tools-properties/text-properties.reel/text-properties.css
@@ -39,7 +39,7 @@
39 width: 160px; 39 width: 160px;
40} 40}
41 41
42.optionsTextTool .toolColorChipCtrl { 42.fontColorChipContainer {
43 margin-left: 6px; 43 margin-left: 10px !important;
44 margin-right: 0px; 44 margin-right: 0px;
45} \ 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 e7fafd0d..f47ca0c8 100755
--- a/js/components/tools-properties/text-properties.reel/text-properties.html
+++ b/js/components/tools-properties/text-properties.reel/text-properties.html
@@ -290,7 +290,7 @@
290 <button data-montage-id="fontSettings" style="display: none"></button> 290 <button data-montage-id="fontSettings" style="display: none"></button>
291 <label class="label">Size:</label> 291 <label class="label">Size:</label>
292 <select data-montage-id="fontSize" class="nj-skinned"></select> 292 <select data-montage-id="fontSize" class="nj-skinned"></select>
293 <div data-montage-id="fontColorCtrl" class="toolColorChipCtrl"></div> 293 <div class="toolColorChipContainer fontColorChipContainer"><div data-montage-id="fontColorCtrl" class="toolColorChipCtrl"></div></div>
294 <div class="btnGroup toolOptionsFloatChildren"> 294 <div class="btnGroup toolOptionsFloatChildren">
295 <button data-montage-id="btnBold" class="btnBold nj-skinned textButton" style="font-weight:bold" title="Bold"></button> 295 <button data-montage-id="btnBold" class="btnBold nj-skinned textButton" style="font-weight:bold" title="Bold"></button>
296 <button data-montage-id="btnItalic" class="btnItalic nj-skinned textButton" style="font-style: italic;"></button> 296 <button data-montage-id="btnItalic" class="btnItalic nj-skinned textButton" style="font-style: italic;"></button>