aboutsummaryrefslogtreecommitdiff
path: root/js/components/layout/tools-properties.reel/tools-properties.html
diff options
context:
space:
mode:
authorJohn Mayhew2012-05-07 14:30:47 -0700
committerJohn Mayhew2012-05-07 14:30:47 -0700
commit29ad6355ef60cfb3b3fc7f780504f3ed30845883 (patch)
treebbe2dcd46c98db8138ad0a8f0263ef33324d7669 /js/components/layout/tools-properties.reel/tools-properties.html
parent1a759361b82127f9d5c1428dc889fffdf2daaf86 (diff)
downloadninja-29ad6355ef60cfb3b3fc7f780504f3ed30845883.tar.gz
More implementation of moving color chips to the individual subtools.
Removed the tool color bar Added new icons for inkbottle Removed Pencil tool Removed Inkbottle tool Added chips to the pen, brush and tag tools Aligned controls in several subtools
Diffstat (limited to 'js/components/layout/tools-properties.reel/tools-properties.html')
-rwxr-xr-xjs/components/layout/tools-properties.reel/tools-properties.html16
1 files changed, 0 insertions, 16 deletions
diff --git a/js/components/layout/tools-properties.reel/tools-properties.html b/js/components/layout/tools-properties.reel/tools-properties.html
index 8dd0f713..c51ab27d 100755
--- a/js/components/layout/tools-properties.reel/tools-properties.html
+++ b/js/components/layout/tools-properties.reel/tools-properties.html
@@ -66,12 +66,6 @@
66 } 66 }
67 } 67 }
68 }, 68 },
69 "pencilProperties1": {
70 "prototype": "js/components/tools-properties/pencil-properties.reel",
71 "properties": {
72 "element": {"#": "pencilProperties"}
73 }
74 },
75 "brushProperties1": { 69 "brushProperties1": {
76 "prototype": "js/components/tools-properties/brush-properties.reel", 70 "prototype": "js/components/tools-properties/brush-properties.reel",
77 "properties": { 71 "properties": {
@@ -90,12 +84,6 @@
90 "element": {"#": "inkbottleProperties"} 84 "element": {"#": "inkbottleProperties"}
91 } 85 }
92 }, 86 },
93 "eyedropperProperties1": {
94 "prototype": "js/components/tools-properties/eyedropper-properties.reel",
95 "properties": {
96 "element": {"#": "eyedropperProperties"}
97 }
98 },
99 "eraserProperties1": { 87 "eraserProperties1": {
100 "prototype": "js/components/tools-properties/eraser-properties.reel", 88 "prototype": "js/components/tools-properties/eraser-properties.reel",
101 "properties": { 89 "properties": {
@@ -147,11 +135,9 @@
147 "penProperties": {"@": "penProperties1"}, 135 "penProperties": {"@": "penProperties1"},
148 "textProperties": {"@": "textProperties1"}, 136 "textProperties": {"@": "textProperties1"},
149 "shapeProperties": {"@": "shapeProperties1"}, 137 "shapeProperties": {"@": "shapeProperties1"},
150 "pencilProperties": {"@": "pencilProperties1"},
151 "brushProperties": {"@": "brushProperties1"}, 138 "brushProperties": {"@": "brushProperties1"},
152 "fillProperties": {"@": "fillProperties1"}, 139 "fillProperties": {"@": "fillProperties1"},
153 "inkbottleProperties": {"@": "inkbottleProperties1"}, 140 "inkbottleProperties": {"@": "inkbottleProperties1"},
154 "eyedropperProperties": {"@": "eyedropperProperties1"},
155 "eraserProperties": {"@": "eraserProperties1"}, 141 "eraserProperties": {"@": "eraserProperties1"},
156 "rotateStageProperties": {"@": "rotateStageProperties1"}, 142 "rotateStageProperties": {"@": "rotateStageProperties1"},
157 "panProperties": {"@": "panProperties1"}, 143 "panProperties": {"@": "panProperties1"},
@@ -179,11 +165,9 @@
179 <div id="penProperties"></div> 165 <div id="penProperties"></div>
180 <div id="textProperties"></div> 166 <div id="textProperties"></div>
181 <div id="shapeProperties"></div> 167 <div id="shapeProperties"></div>
182 <div id="pencilProperties"></div>
183 <div id="brushProperties"></div> 168 <div id="brushProperties"></div>
184 <div id="fillProperties"></div> 169 <div id="fillProperties"></div>
185 <div id="inkbottleProperties"></div> 170 <div id="inkbottleProperties"></div>
186 <div id="eyedropperProperties"></div>
187 <div id="eraserProperties"></div> 171 <div id="eraserProperties"></div>
188 <div id="rotateStageProperties"></div> 172 <div id="rotateStageProperties"></div>
189 <div id="panProperties"></div> 173 <div id="panProperties"></div>