From 29ad6355ef60cfb3b3fc7f780504f3ed30845883 Mon Sep 17 00:00:00 2001 From: John Mayhew Date: Mon, 7 May 2012 14:30:47 -0700 Subject: 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 --- .../tools-properties/fill-properties.reel/fill-properties.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'js/components/tools-properties/fill-properties.reel/fill-properties.html') 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 b81b09ba..6532907e 100755 --- a/js/components/tools-properties/fill-properties.reel/fill-properties.html +++ b/js/components/tools-properties/fill-properties.reel/fill-properties.html @@ -35,7 +35,7 @@
- +
-- cgit v1.2.3 From 33bb9b7e97e9ec3bd664b3e1c3e7297ba8d07ede Mon Sep 17 00:00:00 2001 From: John Mayhew Date: Mon, 7 May 2012 15:44:18 -0700 Subject: more work on making subtool styling/layout consistent --- .../tools-properties/fill-properties.reel/fill-properties.html | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'js/components/tools-properties/fill-properties.reel/fill-properties.html') 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 6532907e..abc2e843 100755 --- a/js/components/tools-properties/fill-properties.reel/fill-properties.html +++ b/js/components/tools-properties/fill-properties.reel/fill-properties.html @@ -34,9 +34,8 @@ -
- - +
+
-- cgit v1.2.3 From 9f0754eb0c619e9e33df707f24eed1dd6ae95096 Mon Sep 17 00:00:00 2001 From: John Mayhew Date: Tue, 8 May 2012 14:48:28 -0700 Subject: implemented proper styling for shape, inkbottle and fill tools make all icons for fill and stroke use the proper classes/images --- .../tools-properties/fill-properties.reel/fill-properties.html | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'js/components/tools-properties/fill-properties.reel/fill-properties.html') 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 fb59e2a8..9fb84a1b 100755 --- a/js/components/tools-properties/fill-properties.reel/fill-properties.html +++ b/js/components/tools-properties/fill-properties.reel/fill-properties.html @@ -35,10 +35,11 @@
- -
- -
+ + +
+ +
-- cgit v1.2.3 From 18370abcf406c6ab36d5c5f2613cb79e756ff6d2 Mon Sep 17 00:00:00 2001 From: John Mayhew Date: Wed, 9 May 2012 18:07:32 -0700 Subject: -Consolidated many redundant css classes used in the tool options bars --- .../tools-properties/fill-properties.reel/fill-properties.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'js/components/tools-properties/fill-properties.reel/fill-properties.html') 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 9fb84a1b..975b4e6f 100755 --- a/js/components/tools-properties/fill-properties.reel/fill-properties.html +++ b/js/components/tools-properties/fill-properties.reel/fill-properties.html @@ -34,12 +34,12 @@ -
+
-
+
-
+
-- cgit v1.2.3 From ba64dfa1d64969e290f15459a826171468fe3550 Mon Sep 17 00:00:00 2001 From: John Mayhew Date: Thu, 10 May 2012 15:10:58 -0700 Subject: put color chips in the inkbottle and fill tool --- .../tools-properties/fill-properties.reel/fill-properties.html | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'js/components/tools-properties/fill-properties.reel/fill-properties.html') 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 975b4e6f..734966dc 100755 --- a/js/components/tools-properties/fill-properties.reel/fill-properties.html +++ b/js/components/tools-properties/fill-properties.reel/fill-properties.html @@ -23,18 +23,25 @@ "prototype": "js/components/tools-properties/fill-properties.reel", "properties": { "element": {"#": "fillProperties"}, + + "_fillColorCtrl": {"#": "fillColorCtrl"}, + "_useWebGL": {"#": "useWebGLCH"}, "_materialsContainer": {"#": "materialsContainer"}, "_fillMaterial": {"@": "_fillMaterialCB"} } } } - +
+
+
+
 
+
-- cgit v1.2.3