From f8fd9a7be81334a2014a0da49771748f5d57a9f1 Mon Sep 17 00:00:00 2001 From: Jeff Schiller Date: Mon, 20 Jul 2009 13:56:01 +0000 Subject: [PATCH] Fix Issue 77: Declare charset git-svn-id: http://svg-edit.googlecode.com/svn/trunk@335 eee81c28-f429-11dd-99c0-75d572ba1ddd --- editor/svg-editor.css | 44 ++++++++++++++++++++---------------------- editor/svg-editor.html | 15 ++++++++++++++ editor/svg-editor.js | 6 ++++++ 3 files changed, 42 insertions(+), 23 deletions(-) diff --git a/editor/svg-editor.css b/editor/svg-editor.css index 412854a7..ca8401ff 100644 --- a/editor/svg-editor.css +++ b/editor/svg-editor.css @@ -205,34 +205,32 @@ div.color_block { position: absolute; display: none; cursor: pointer; - float: left; - width: 300px; } -#svg_editor #tool_square { - background: 2px 2px url('images/square.png') no-repeat; +#svg_editor .tools_flyout_v { + position: absolute; + display: none; + cursor: pointer; + width: 30px; } -#svg_editor #tool_rect { - background: 2px 2px url('images/rect.png') no-repeat; -} - -#svg_editor #tool_fhrect { - background: 2px 2px url('images/freehand-square.png') no-repeat; -} - -#svg_editor #tool_circle { - background: 2px 2px url('images/circle.png') no-repeat; -} - -#svg_editor #tool_ellipse { - background: 2px 2px url('images/ellipse.png') no-repeat; -} - -#svg_editor #tool_fhellipse { - background: 2px 2px url('images/freehand-circle.png') no-repeat; -} +#svg_editor #tool_square { background: 2px 2px url('images/square.png') no-repeat; } +#svg_editor #tool_rect { background: 2px 2px url('images/rect.png') no-repeat; } +#svg_editor #tool_fhrect { background: 2px 2px url('images/freehand-square.png') no-repeat; } +#svg_editor #tool_circle { background: 2px 2px url('images/circle.png') no-repeat; } +#svg_editor #tool_ellipse { background: 2px 2px url('images/ellipse.png') no-repeat; } +#svg_editor #tool_fhellipse { background: 2px 2px url('images/freehand-circle.png') no-repeat; } +#svg_editor #tool_stacktop { background: 2px 2px url('images/move_top.png') no-repeat; } +#svg_editor #tool_stackbottom { background: 2px 2px url('images/move_bottom.png') no-repeat; } +#svg_editor #tool_aligntop { background: 2px 2px url('images/align-vertical-top.png') no-repeat; } +#svg_editor #tool_alignmiddle { background: 2px 2px url('images/align-vertical-middle.png') no-repeat; } +#svg_editor #tool_alignbottom { background: 2px 2px url('images/align-vertical-bottom.png') no-repeat; } +#svg_editor #tool_alignleft { background: 2px 2px url('images/align-horizontal-left.png') no-repeat; } +#svg_editor #tool_aligncenter { background: 2px 2px url('images/align-horizontal-center.png') no-repeat; } +#svg_editor #tool_alignright { background: 2px 2px url('images/align-horizontal-right.png') no-repeat; } +/* TODO: figure out what more-specific selector causes me to write this atrocity and not + simply .tool_flyout_button */ #svg_editor #tools_rect .tool_flyout_button, #svg_editor #tools_ellipse .tool_flyout_button { float: left; background-color: #E8E8E8; diff --git a/editor/svg-editor.html b/editor/svg-editor.html index 58f0f221..68d21708 100644 --- a/editor/svg-editor.html +++ b/editor/svg-editor.html @@ -1,6 +1,7 @@ + @@ -223,6 +224,20 @@
+
+
+
+
+ +
+
+
+
+
+
+
+
+
diff --git a/editor/svg-editor.js b/editor/svg-editor.js index bf6b0ebf..9218ca45 100644 --- a/editor/svg-editor.js +++ b/editor/svg-editor.js @@ -581,6 +581,7 @@ function svg_edit_setup() { } var pos = elem.position(); picker = 'stroke'; + console.log(color); $('#color_picker').css({'left': pos.left - 140, 'bottom': 104 - pos.top}).jPicker({ images: { clientPath: "jpicker/images/" }, color: { active: color, alphaSupport: true } @@ -673,6 +674,11 @@ function svg_edit_setup() { }); $('#tools_rect').mouseleave(function(){$('#tools_rect').fadeOut();}); + $('#tool_move_top').mousedown(function(evt){ + $('#tools_stacking').show(); + evt.preventDefault(); + }); + $('#tools_ellipse_show').mousedown(function(evt){ $('#tools_ellipse').show(); // this prevents the 'image drag' behavior in Firefox