diff options
author | Valerio Virgillito | 2012-06-21 14:30:46 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-06-21 14:30:46 -0700 |
commit | 01dc38612c10c2d07596f3de0ca1897243a54a96 (patch) | |
tree | 9cbfd72644568daae9c5b9f43126ddc214d260dc | |
parent | c8fc6d15e1570e89243abe527cd149e354f7e11f (diff) | |
parent | 4b186e0c3f97f704d1ac671a63cd02084e19fe0e (diff) | |
download | ninja-01dc38612c10c2d07596f3de0ca1897243a54a96.tar.gz |
Merge pull request #318 from joseeight/Color
Color
12 files changed, 38 insertions, 19 deletions
diff --git a/css/ninja.css b/css/ninja.css index 4d2de3ee..d98aa513 100755 --- a/css/ninja.css +++ b/css/ninja.css | |||
@@ -677,7 +677,9 @@ nav.menuBar ul li:hover ul, nav.menuBar ul ul li:hover ul, nav.menuBar ul ul ul | |||
677 | 677 | ||
678 | .toolOptionsSpacer { margin-right: 9px; } | 678 | .toolOptionsSpacer { margin-right: 9px; } |
679 | 679 | ||
680 | .toolColorChipCtrl { width: 18px; height: 18px; margin-top: 1px; margin-left: 3px; margin-right: 8px; border: 1px black solid; } | 680 | .toolColorChipCtrl { width: 16px; height: 16px; border: 1px #000 solid; } |
681 | |||
682 | .toolColorChipContainer { background: url(../../../../../images/colorpanel/transparent.png) repeat; width: 18px; height: 18px; margin-top: 1px; margin-left: 3px; margin-right: 8px; border: 1px #777 solid; } | ||
681 | 683 | ||
682 | .toolColorChipIcon { width: 20px; height: 20px; margin-top: 1px; -webkit-transform: scale(0.8); background-color: #282828; } | 684 | .toolColorChipIcon { width: 20px; height: 20px; margin-top: 1px; -webkit-transform: scale(0.8); background-color: #282828; } |
683 | 685 | ||
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"> </div> | 86 | <div class="nj-divider divider-vertical"> </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"> </div> | 70 | <div class="nj-divider divider-vertical toolOptionsSpacer"> </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"> </div> | 155 | <div class="nj-divider divider-vertical toolOptionsSpacer"> </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"> </div> | 51 | <div class="nj-divider divider-vertical toolOptionsSpacer"> </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"> </div> | 57 | <div class="nj-divider divider-vertical"> </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"> </div> | 137 | <div class="nj-divider divider-vertical toolOptionsSpacer"> </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"> </div> | 142 | <div class="nj-divider divider-vertical"> </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"> </div> | 48 | <div class="nj-divider divider-vertical toolOptionsSpacer"> </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"> </div> | 52 | <div class="nj-divider divider-vertical toolOptionsSpacer"> </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> |