diff options
| author | John Mayhew | 2012-05-10 15:10:58 -0700 |
|---|---|---|
| committer | John Mayhew | 2012-05-10 15:10:58 -0700 |
| commit | ba64dfa1d64969e290f15459a826171468fe3550 (patch) | |
| tree | 10b26bbfde954d4069b58e866d1105047a2ec72e /js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html | |
| parent | d32cf39a8ef1e2d2fb50f1183c5546fdac83b396 (diff) | |
| download | ninja-ba64dfa1d64969e290f15459a826171468fe3550.tar.gz | |
put color chips in the inkbottle and fill tool
Diffstat (limited to 'js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html')
| -rwxr-xr-x | js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html | 8 |
1 files changed, 7 insertions, 1 deletions
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 f5b1851f..3ac0b261 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 | |||
| @@ -136,6 +136,8 @@ | |||
| 136 | "properties": { | 136 | "properties": { |
| 137 | "element": {"#": "inkBottleProperties"}, | 137 | "element": {"#": "inkBottleProperties"}, |
| 138 | 138 | ||
| 139 | "_strokeColorCtrl": {"#": "strokeColorCtrl"}, | ||
| 140 | |||
| 139 | "useBorderWidth": {"@": "borderWidthCh"}, | 141 | "useBorderWidth": {"@": "borderWidthCh"}, |
| 140 | "borderWidthLabel": {"@": "borderWidthLabel"}, | 142 | "borderWidthLabel": {"@": "borderWidthLabel"}, |
| 141 | "_borderWidth": {"@": "borderWidthHT"}, | 143 | "_borderWidth": {"@": "borderWidthHT"}, |
| @@ -154,13 +156,17 @@ | |||
| 154 | } | 156 | } |
| 155 | } | 157 | } |
| 156 | } | 158 | } |
| 157 | </script> | 159 | </script> |
| 158 | 160 | ||
| 159 | </head> | 161 | </head> |
| 160 | 162 | ||
| 161 | <body> | 163 | <body> |
| 162 | <div data-montage-id="inkBottleProperties" class="subToolHolderPanel inkBottleOptions toolOptionsFloatChildren"> | 164 | <div data-montage-id="inkBottleProperties" class="subToolHolderPanel inkBottleOptions toolOptionsFloatChildren"> |
| 163 | <div data-montage-id="elementInkOptions" class="toolOptionsFloatChildren"> | 165 | <div data-montage-id="elementInkOptions" class="toolOptionsFloatChildren"> |
| 166 | <div class="toolColorChipIcon PencilTool"></div> | ||
| 167 | <div data-montage-id="strokeColorCtrl" class="toolColorChipCtrl"></div> | ||
| 168 | <div class="nj-divider divider-vertical toolOptionsSpacer"> </div> | ||
| 169 | |||
| 164 | <input data-montage-id="useBorderWidthCh" type="checkbox" name="useBorderWidthControl" class="nj-skinned" title="Apply border-width"/> | 170 | <input data-montage-id="useBorderWidthCh" type="checkbox" name="useBorderWidthControl" class="nj-skinned" title="Apply border-width"/> |
| 165 | <label data-montage-id="borderWidthLabel" class="label"> Border:</label> | 171 | <label data-montage-id="borderWidthLabel" class="label"> Border:</label> |
| 166 | <div data-montage-id="borderWidth" class="label"></div> | 172 | <div data-montage-id="borderWidth" class="label"></div> |