+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Move elements to:
+
+
+ Layers
+ + +| + | Layer 1 | +
L a y e r s
+
+
+ 
+
+
+
+
+
+
+
+
+
+
+
+ 
+
+
+ 
+ 
+ 
+ 
+
+
+
+
+
+
+ 
+
+
+
+
+
+
+
+
+ 
+ 
+
+
+
+
+
+
+ 
+ 
+ 
+
+
+ 
+ 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ -
+
+
- +
- 100% (no transparency) +
- 0% +
- 25% +
- 50% +
- 75% + +
- 100% +
+
+
+
+
+ 
+
+
+
+
+
+
+
+ relative to:
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ relative to:
+
+
+
+
+
+
+ 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 
+ 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 
+
+
+
+ 
+ 
+
+ 
+
+ 
+ 
+ 
+
+
++
+
+
+
+ +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ zoom:
+
+
+
+
+
+
+
+
+ -
+
- 100% +
- Fit to all content +
- Fit to layer content + +
- Fit to selection +
- Fit to canvas +
- 25% +
- 50% +
- 100% +
- 200% + +
- 400% +
- 1000% +
+
+
+
+
+
+
+ | fill: | ++ | 100% |
+ ||
| stroke: | + ++ | 100 % |
+ + + | ++ + | +
+
+
+
Powered by SVG-edit v2.4-alpha
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/editor/svg-editor-classic.js b/editor/svg-editor-classic.js
new file mode 100644
index 00000000..9b9e5723
--- /dev/null
+++ b/editor/svg-editor-classic.js
@@ -0,0 +1,1689 @@
+/*
+if(!window.console) {
+ window.console = new function() {
+ this.log = function(str) {};
+ this.dir = function(str) {};
+ };
+}
+*/
+
+function svg_edit_setup() {
+ var palette = ["#000000","#202020","#404040","#606060","#808080","#a0a0a0","#c0c0c0","#e0e0e0","#ffffff","#800000","#ff0000","#808000","#ffff00","#008000","#00ff00","#008080","#00ffff","#000080","#0000ff","#800080","#ff00ff","#2b0000","#550000","#800000","#aa0000","#d40000","#ff0000","#ff2a2a","#ff5555","#ff8080","#ffaaaa","#ffd5d5","#280b0b","#501616","#782121","#a02c2c","#c83737","#d35f5f","#de8787","#e9afaf","#f4d7d7","#241c1c","#483737","#6c5353","#916f6f","#ac9393","#c8b7b7","#e3dbdb","#2b1100","#552200","#803300","#aa4400","#d45500","#ff6600","#ff7f2a","#ff9955","#ffb380","#ffccaa","#ffe6d5","#28170b","#502d16","#784421","#a05a2c","#c87137","#d38d5f","#deaa87","#e9c6af","#f4e3d7","#241f1c","#483e37","#6c5d53","#917c6f","#ac9d93","#c8beb7","#e3dedb","#2b2200","#554400","#806600","#aa8800","#d4aa00","#ffcc00","#ffd42a","#ffdd55","#ffe680","#ffeeaa","#fff6d5","#28220b","#504416","#786721","#a0892c","#c8ab37","#d3bc5f","#decd87","#e9ddaf","#f4eed7","#24221c","#484537","#6c6753","#918a6f","#aca793","#c8c4b7","#e3e2db","#222b00","#445500","#668000","#88aa00","#aad400","#ccff00","#d4ff2a","#ddff55","#e5ff80","#eeffaa","#f6ffd5","#22280b","#445016","#677821","#89a02c","#abc837","#bcd35f","#cdde87","#dde9af","#eef4d7","#22241c","#454837","#676c53","#8a916f","#a7ac93","#c4c8b7","#e2e3db","#112b00","#225500","#338000","#44aa00","#55d400","#66ff00","#7fff2a","#99ff55","#b3ff80","#ccffaa","#e5ffd5","#17280b","#2d5016","#447821","#5aa02c","#71c837","#8dd35f","#aade87","#c6e9af","#e3f4d7","#1f241c","#3e4837","#5d6c53","#7c916f","#9dac93","#bec8b7","#dee3db","#002b00","#005500","#008000","#00aa00","#00d400","#00ff00","#2aff2a","#55ff55","#80ff80","#aaffaa","#d5ffd5","#0b280b","#165016","#217821","#2ca02c","#37c837","#5fd35f","#87de87","#afe9af","#d7f4d7","#1c241c","#374837","#536c53","#6f916f","#93ac93","#b7c8b7","#dbe3db","#002b11","#005522","#008033","#00aa44","#00d455","#00ff66","#2aff80","#55ff99","#80ffb3","#aaffcc","#d5ffe6","#0b2817","#16502d","#217844","#2ca05a","#37c871","#5fd38d","#87deaa","#afe9c6","#d7f4e3","#1c241f","#37483e","#536c5d","#6f917c","#93ac9d","#b7c8be","#dbe3de","#002b22","#005544","#008066","#00aa88","#00d4aa","#00ffcc","#2affd5","#55ffdd","#80ffe6","#aaffee","#d5fff6","#0b2822","#165044","#217867","#2ca089","#37c8ab","#5fd3bc","#87decd","#afe9dd","#d7f4ee","#1c2422","#374845","#536c67","#6f918a","#93aca7","#b7c8c4","#dbe3e2","#00222b","#004455","#006680","#0088aa","#00aad4","#00ccff","#2ad4ff","#55ddff","#80e5ff","#aaeeff","#d5f6ff","#0b2228","#164450","#216778","#2c89a0","#37abc8","#5fbcd3","#87cdde","#afdde9","#d7eef4","#1c2224","#374548","#53676c","#6f8a91","#93a7ac","#b7c4c8","#dbe2e3","#00112b","#002255","#003380","#0044aa","#0055d4","#0066ff","#2a7fff","#5599ff","#80b3ff","#aaccff","#d5e5ff","#0b1728","#162d50","#214478","#2c5aa0","#3771c8","#5f8dd3","#87aade","#afc6e9","#d7e3f4","#1c1f24","#373e48","#535d6c","#6f7c91","#939dac","#b7bec8","#dbdee3","#00002b","#000055","#000080","#0000aa","#0000d4","#0000ff","#2a2aff","#5555ff","#8080ff","#aaaaff","#d5d5ff","#0b0b28","#161650","#212178","#2c2ca0","#3737c8","#5f5fd3","#8787de","#afafe9","#d7d7f4","#1c1c24","#373748","#53536c","#6f6f91","#9393ac","#b7b7c8","#dbdbe3","#11002b","#220055","#330080","#4400aa","#5500d4","#6600ff","#7f2aff","#9955ff","#b380ff","#ccaaff","#e5d5ff","#170b28","#2d1650","#442178","#5a2ca0","#7137c8","#8d5fd3","#aa87de","#c6afe9","#e3d7f4","#1f1c24","#3e3748","#5d536c","#7c6f91","#9d93ac","#beb7c8","#dedbe3","#22002b","#440055","#660080","#8800aa","#aa00d4","#cc00ff","#d42aff","#dd55ff","#e580ff","#eeaaff","#f6d5ff","#220b28","#441650","#672178","#892ca0","#ab37c8","#bc5fd3","#cd87de","#ddafe9","#eed7f4","#221c24","#453748","#67536c","#8a6f91","#a793ac","#c4b7c8","#e2dbe3","#2b0022","#550044","#800066","#aa0088","#d400aa","#ff00cc","#ff2ad4","#ff55dd","#ff80e5","#ffaaee","#ffd5f6","#280b22","#501644","#782167","#a02c89","#c837ab","#d35fbc","#de87cd","#e9afdd","#f4d7ee","#241c22","#483745","#6c5367","#916f8a","#ac93a7","#c8b7c4","#e3dbe2","#2b0011","#550022","#800033","#aa0044","#d40055","#ff0066","#ff2a7f","#ff5599","#ff80b2","#ffaacc","#ffd5e5","#280b17","#50162d","#782144","#a02c5a","#c83771","#d35f8d","#de87aa","#e9afc6","#f4d7e3","#241c1f","#48373e","#6c535d","#916f7c","#ac939d","#c8b7be","#e3dbde"]
+
+ var isMac = false; //(navigator.platform.indexOf("Mac") != -1);
+ var modKey = ""; //(isMac ? "meta+" : "ctrl+");
+ var svgCanvas = new SvgCanvas(document.getElementById("svgcanvas"));
+
+ var setSelectMode = function() {
+ $('.tool_button_current').removeClass('tool_button_current').addClass('tool_button');
+ $('#tool_select').addClass('tool_button_current');
+ $('#styleoverrides').text('#svgcanvas svg *{cursor:move;pointer-events:all} #svgcanvas svg{cursor:default}');
+ svgCanvas.setMode('select');
+ };
+
+ // used to make the flyouts stay on the screen longer the very first time
+ var flyoutspeed = 1250;
+ var textBeingEntered = false;
+ var selectedElement = null;
+ var multiselected = false;
+ var editingsource = false;
+ var docprops = false;
+ var length_attrs = ['x','y','x1','x2','y1','y2','cx','cy','width','height','r','rx','ry','width','height','radius'];
+ var length_types = ['em','ex','px','cm','mm','in','pt','pc','%'];
+
+ var fillPaint = new $.jGraduate.Paint({solidColor: "FF0000"}); // solid red
+ var strokePaint = new $.jGraduate.Paint({solidColor: "000000"}); // solid black
+
+ // TODO: Unfortunately Mozilla does not handle internal references to gradients
+ // inside a data: URL document. This means that any elements filled/stroked
+ // with a gradient will appear black in Firefox, etc. See bug 308590
+ // https://bugzilla.mozilla.org/show_bug.cgi?id=308590
+ var saveHandler = function(window,svg) {
+ window.open("data:image/svg+xml;base64," + Utils.encode64(svg));
+ };
+
+ // called when we've selected a different element
+ var selectedChanged = function(window,elems) {
+ // if elems[1] is present, then we have more than one element
+ selectedElement = (elems.length == 1 || elems[1] == null ? elems[0] : null);
+ multiselected = (elems.length >= 2 && elems[1] != null);
+ var is_node = false;
+ if (selectedElement != null) {
+ // unless we're already in always set the mode of the editor to select because
+ // upon creation of a text element the editor is switched into
+ // select mode and this event fires - we need our UI to be in sync
+
+ is_node = !!(selectedElement.id && selectedElement.id.indexOf('pathpointgrip') == 0);
+
+ if (svgCanvas.getMode() != "multiselect" && !is_node) {
+ setSelectMode();
+ updateToolbar();
+ }
+
+ } // if (elem != null)
+
+
+ // Deal with pathedit mode
+ $('#path_node_panel').toggle(is_node);
+ $('#tools_bottom_2,#tools_bottom_3').toggle(!is_node);
+ if(is_node) {
+ // Change select icon
+ $('.tool_button').removeClass('tool_button_current');
+ $('#tool_select').attr('src','images/select_node.png').addClass('tool_button_current');
+ } else {
+ $('#tool_select').attr('src','images/select.png');
+
+ }
+
+ updateContextPanel();
+ };
+
+ // called when any element has changed
+ var elementChanged = function(window,elems) {
+ for (var i = 0; i < elems.length; ++i) {
+ var elem = elems[i];
+ // if the element changed was the svg, then it could be a resolution change
+ if (elem && elem.tagName == "svg" && elem.getAttribute("viewBox")) {
+ var vb = elem.getAttribute("viewBox").split(' ');
+ changeResolution(parseInt(vb[2]),
+ parseInt(vb[3]));
+ }
+ }
+
+ // we update the contextual panel with potentially new
+ // positional/sizing information (we DON'T want to update the
+ // toolbar here as that creates an infinite loop)
+ // also this updates the history buttons
+
+ // we tell it to skip focusing the text control if the
+ // text element was previously in focus
+ updateContextPanel();
+ };
+
+ var updateBgImage = function() {
+ var bg_img = $('#background_img');
+ if(!bg_img.length) return;
+ var img = bg_img.find('img');
+ var zoomlevel = svgCanvas.getZoom();
+ img.width(zoomlevel*100 + '%');
+ }
+
+ var zoomChanged = function(window, bbox) {
+ var scrbar = 15;
+ var res = svgCanvas.getResolution();
+ var w_area = $('#workarea');
+ var canvas_pos = $('#svgcanvas').position();
+ w_area.css('cursor','auto');
+ var z_info = svgCanvas.setBBoxZoom(bbox, w_area.width()-scrbar, w_area.height()-scrbar);
+ if(!z_info) return;
+ var zoomlevel = z_info.zoom;
+ var bb = z_info.bbox;
+ $('#zoom').val(Math.round(zoomlevel*100));
+ setResolution(res.w * zoomlevel, res.h * zoomlevel);
+ var scrLeft = bb.x * zoomlevel;
+ var scrOffX = w_area.width()/2 - (bb.width * zoomlevel)/2;
+ w_area[0].scrollLeft = Math.max(0,scrLeft - scrOffX) + Math.max(0,canvas_pos.left);
+ var scrTop = bb.y * zoomlevel;
+ var scrOffY = w_area.height()/2 - (bb.height * zoomlevel)/2;
+ w_area[0].scrollTop = Math.max(0,scrTop - scrOffY) + Math.max(0,canvas_pos.top);
+ if(svgCanvas.getMode() == 'zoom' && bb.width) {
+ // Go to select if a zoom box was drawn
+ setSelectMode();
+ }
+ }
+
+ // updates the toolbar (colors, opacity, etc) based on the selected element
+ var updateToolbar = function() {
+ if (selectedElement != null &&
+ selectedElement.tagName != "image" &&
+ selectedElement.tagName != "g")
+ {
+ // get opacity values
+ var fillOpacity = parseFloat(selectedElement.getAttribute("fill-opacity"));
+ if (isNaN(fillOpacity)) {
+ fillOpacity = 1.0;
+ }
+
+ var strokeOpacity = parseFloat(selectedElement.getAttribute("stroke-opacity"));
+ if (isNaN(strokeOpacity)) {
+ strokeOpacity = 1.0;
+ }
+
+ // update fill color and opacity
+ var fillColor = selectedElement.getAttribute("fill")||"none";
+ // prevent undo on these canvas changes
+ svgCanvas.setFillColor(fillColor, true);
+ svgCanvas.setFillOpacity(fillOpacity, true);
+
+ // update stroke color and opacity
+ var strokeColor = selectedElement.getAttribute("stroke")||"none";
+ // prevent undo on these canvas changes
+ svgCanvas.setStrokeColor(strokeColor, true);
+ svgCanvas.setStrokeOpacity(strokeOpacity, true);
+
+ fillOpacity *= 100;
+ strokeOpacity *= 100;
+
+ var getPaint = function(color, opac) {
+ // update the editor's fill paint
+ var opts = null;
+
+ if (color.substr(0,5) == "url(#") {
+ opts = {
+ alpha: opac,
+ linearGradient: document.getElementById(color.substr(5,color.length-6))
+ };
+ }
+ else if (color.substr(0,1) == "#") {
+ opts = {
+ alpha: opac,
+ solidColor: color.substr(1)
+ };
+ }
+ return new $.jGraduate.Paint(opts);
+ }
+
+ fillPaint = getPaint(fillColor, fillOpacity);
+ strokePaint = getPaint(strokeColor, strokeOpacity);
+
+ fillOpacity = fillOpacity + " %";
+ strokeOpacity = strokeOpacity + " %";
+
+ // update fill color
+ if (fillColor == "none") {
+ fillOpacity = "N/A";
+ }
+ document.getElementById("gradbox_fill").parentNode.firstChild.setAttribute("fill", fillColor);
+
+ if (strokeColor == null || strokeColor == "" || strokeColor == "none") {
+ strokeColor = "none";
+ strokeOpacity = "N/A";
+ }
+
+ // update the rect inside #fill_color
+ document.getElementById("gradbox_stroke").parentNode.firstChild.setAttribute("fill", strokeColor);
+
+ $('#fill_opacity').html(fillOpacity);
+ $('#stroke_opacity').html(strokeOpacity);
+ var opac_perc = ((selectedElement.getAttribute("opacity")||1.0)*100);
+ $('#group_opacity').val(opac_perc);
+ $('#opac_slider').slider('option', 'value', opac_perc);
+ $('#stroke_width').val(selectedElement.getAttribute("stroke-width")||1);
+ $('#stroke_style').val(selectedElement.getAttribute("stroke-dasharray")||"none");
+ }
+
+ updateToolButtonState();
+ };
+
+ // updates the context panel tools based on the selected element
+ var updateContextPanel = function() {
+ var elem = selectedElement;
+ var currentLayer = svgCanvas.getCurrentLayer();
+
+ // No need to update anything else in rotate mode
+ if (svgCanvas.getMode() == 'rotate' && elem != null) {
+ $('#angle').val(svgCanvas.getRotationAngle(elem));
+ return;
+ }
+
+ var is_node = elem ? (elem.id && elem.id.indexOf('pathpointgrip') == 0) : false;
+
+ $('#selected_panel, #multiselected_panel, #g_panel, #rect_panel, #circle_panel,\
+ #ellipse_panel, #line_panel, #text_panel, #image_panel').hide();
+ if (elem != null) {
+ $('#angle').val(svgCanvas.getRotationAngle(elem));
+
+ if(!is_node) {
+ $('#selected_panel').show();
+ } else {
+ var point = svgCanvas.getNodePoint();
+ if(point) {
+ var seg_type = $('#seg_type');
+ $('#path_node_x').val(point.x);
+ $('#path_node_y').val(point.y);
+ if(point.type) {
+ seg_type.val(point.type).removeAttr('disabled');
+ } else {
+ seg_type.val(4).attr('disabled','disabled');
+ }
+ }
+ return;
+ }
+
+ // update contextual tools here
+ var panels = {
+ g: [],
+ rect: ['rx','x','y','width','height'],
+ image: ['x','y','width','height'],
+ circle: ['cx','cy','r'],
+ ellipse: ['cx','cy','rx','ry'],
+ line: ['x1','y1','x2','y2'],
+ text: ['x','y']
+ };
+
+ var el_name = elem.tagName;
+
+ if(panels[el_name]) {
+ var cur_panel = panels[el_name];
+
+
+ $('#' + el_name + '_panel').show();
+
+ $.each(cur_panel, function(i, item) {
+ $('#' + el_name + '_' + item).val(elem.getAttribute(item) || 0);
+ });
+
+ if(el_name == 'text') {
+ $('#text_panel').css("display", "inline");
+ if (svgCanvas.getItalic()) {
+ $('#tool_italic').addClass('tool_button_current');
+ }
+ else {
+ $('#tool_italic').removeClass('tool_button_current');
+ }
+ if (svgCanvas.getBold()) {
+ $('#tool_bold').addClass('tool_button_current');
+ }
+ else {
+ $('#tool_bold').removeClass('tool_button_current');
+ }
+ $('#font_family').val(elem.getAttribute("font-family"));
+ $('#font_size').val(elem.getAttribute("font-size"));
+ $('#text').val(elem.textContent);
+ if (svgCanvas.addedNew) {
+ $('#text').focus().select();
+ }
+ } // text
+ else if(el_name == 'image') {
+ var xlinkNS="http://www.w3.org/1999/xlink";
+ $('#image_url').val(elem.getAttributeNS(xlinkNS, "href"));
+ } // image
+ }
+ } // if (elem != null)
+ else if (multiselected) {
+ $('#multiselected_panel').show();
+ }
+
+ // update history buttons
+ if (svgCanvas.getUndoStackSize() > 0) {
+ $('#tool_undo').removeClass( 'tool_button_disabled');
+ }
+ else {
+ $('#tool_undo').addClass( 'tool_button_disabled');
+ }
+ if (svgCanvas.getRedoStackSize() > 0) {
+ $('#tool_redo').removeClass( 'tool_button_disabled');
+ }
+ else {
+ $('#tool_redo').addClass( 'tool_button_disabled');
+ }
+
+ svgCanvas.addedNew = false;
+
+ if ( (elem && !is_node) || multiselected) {
+ // update the selected elements' layer
+ $('#selLayerNames').removeAttr('disabled').val(currentLayer);
+ }
+ else {
+ $('#selLayerNames').attr('disabled', 'disabled');
+ }
+
+ };
+
+ $('#text').focus( function(){ textBeingEntered = true; } );
+ $('#text').blur( function(){ textBeingEntered = false; } );
+
+ // bind the selected event to our function that handles updates to the UI
+ svgCanvas.bind("selected", selectedChanged);
+ svgCanvas.bind("changed", elementChanged);
+ svgCanvas.bind("saved", saveHandler);
+ svgCanvas.bind("zoomed", zoomChanged);
+
+ var str = ''
+ $.each(palette, function(i,item){
+ str += '';
+ });
+ $('#palette').append(str);
+
+ // Set up editor background functionality
+ var color_blocks = ['#FFF','#888','#000','url(data:image/gif;base64,R0lGODlhEAAQAIAAAP%2F%2F%2F9bW1iH5BAAAAAAALAAAAAAQABAAAAIfjG%2Bgq4jM3IFLJgpswNly%2FXkcBpIiVaInlLJr9FZWAQA7)'];
+ var str = '';
+ $.each(color_blocks, function() {
+ str += '';
+ });
+ $('#bg_blocks').append(str);
+ var blocks = $('#bg_blocks div');
+ var cur_bg = 'cur_background';
+ blocks.each(function() {
+ var blk = $(this);
+ blk.click(function() {
+ blocks.removeClass(cur_bg);
+ $(this).addClass(cur_bg);
+ $('#canvas_bg_url').removeClass(cur_bg);
+ });
+ });
+ $('#canvas_bg_url').focus(function() {
+ blocks.removeClass(cur_bg);
+ $(this).addClass(cur_bg);
+ });
+
+ var pos = $('#tools_rect_show').position();
+ $('#tools_rect').css({'left': pos.left+4, 'top': pos.top+77});
+ pos = $('#tools_ellipse_show').position();
+ $('#tools_ellipse').css({'left': pos.left+4, 'top': pos.top+77});
+
+ var changeRectRadius = function(ctl) {
+ svgCanvas.setRectRadius(ctl.value);
+ }
+
+ var changeFontSize = function(ctl) {
+ svgCanvas.setFontSize(ctl.value);
+ }
+
+ var changeStrokeWidth = function(ctl) {
+ var val = ctl.value;
+ if(val == 0 && selectedElement && $.inArray(selectedElement.nodeName, ['line', 'polyline']) != -1) {
+ val = ctl.value = 1;
+ }
+ svgCanvas.setStrokeWidth(val);
+ }
+
+ var changeRotationAngle = function(ctl) {
+ svgCanvas.setRotationAngle(ctl.value);
+ }
+ var changeZoom = function(ctl) {
+ var zoomlevel = ctl.value / 100;
+ var zoom = svgCanvas.getZoom();
+ var w_area = $('#workarea');
+
+ zoomChanged(window, {
+ width: 0,
+ height: 0,
+ x: (w_area[0].scrollLeft + w_area.width()/2)/zoom,
+ y: (w_area[0].scrollTop + w_area.height()/2)/zoom,
+ zoom: zoomlevel
+ });
+ }
+
+ var changeOpacity = function(ctl, val) {
+ if(val == null) val = ctl.value;
+ $('#group_opacity').val(val);
+ if(!ctl || !ctl.handle) {
+ $('#opac_slider').slider('option', 'value', val);
+ }
+ svgCanvas.setOpacity(val/100);
+ }
+
+ $('#stroke_style').change(function(){
+ svgCanvas.setStrokeStyle(this.options[this.selectedIndex].value);
+ });
+
+ // Lose focus for select elements when changed (Allows keyboard shortcuts to work better)
+ $('select').change(function(){$(this).blur();});
+
+ // fired when user wants to move elements to another layer
+ var promptMoveLayerOnce = false;
+ $('#selLayerNames').change(function(){
+ var destLayer = this.options[this.selectedIndex].value;
+ // TODO: localize this prompt
+ if (destLayer && (promptMoveLayerOnce || confirm('Move selected elements to layer \'' + destLayer + '\'?'))) {
+ promptMoveLayerOnce = true;
+ svgCanvas.moveSelectedToLayer(destLayer);
+ svgCanvas.clearSelection();
+ populateLayers();
+ }
+ });
+
+ $('#font_family').change(function(){
+ svgCanvas.setFontFamily(this.options[this.selectedIndex].value);
+ });
+
+ $('#seg_type').change(function() {
+ svgCanvas.setSegType($(this).val());
+ });
+
+ $('#text').keyup(function(){
+ svgCanvas.setTextContent(this.value);
+ });
+
+ // TODO: consider only setting the URL once Enter has been pressed?
+ $('#image_url').keyup(function(){
+ svgCanvas.setImageURL(this.value);
+ });
+
+ $('.attr_changer').change(function() {
+ var attr = this.getAttribute("data-attr");
+ var val = this.value;
+ var valid = false;
+ if($.inArray(attr, length_attrs) != -1) {
+ if(!isNaN(val)) {
+ valid = true;
+ } else {
+ //TODO: Allow the values in length_types, then uncomment this:
+// val = val.toLowerCase();
+// $.each(length_types, function(i, unit) {
+// if(valid) return;
+// var re = new RegExp('^-?[\\d\\.]+' + unit + '$');
+// if(re.test(val)) valid = true;
+// });
+ }
+ } else valid = true;
+
+ if(!valid) {
+ // TODO: localize this
+ alert('Invalid value given for' + $(this).attr('title').replace('Change','')
+ + '.');
+ this.value = selectedElement.getAttribute(attr);
+ return false;
+ }
+ svgCanvas.changeSelectedAttribute(attr, val);
+ });
+
+ // Prevent selection of elements when shift-clicking
+ $('#palette').mouseover(function() {
+ var inp = $('');
+ $(this).append(inp);
+ inp.focus().remove();
+ });
+
+ $('.palette_item').click(function(evt){
+ var picker = (evt.shiftKey ? "stroke" : "fill");
+ var id = (evt.shiftKey ? '#stroke_' : '#fill_');
+ var color = $(this).attr('data-rgb');
+ var rectbox = document.getElementById("gradbox_"+picker).parentNode.firstChild;
+ var paint = null;
+
+ // Webkit-based browsers returned 'initial' here for no stroke
+ if (color == 'transparent' || color == 'initial') {
+ color = 'none';
+ $(id + "opacity").html("N/A");
+ paint = new $.jGraduate.Paint();
+ }
+ else {
+ paint = new $.jGraduate.Paint({alpha: 100, solidColor: color.substr(1)});
+ }
+ rectbox.setAttribute("fill", color);
+
+ if (evt.shiftKey) {
+ strokePaint = paint;
+ if (svgCanvas.getStrokeColor() != color) {
+ svgCanvas.setStrokeColor(color);
+ }
+ if (color != 'none' && svgCanvas.getStrokeOpacity() != 1) {
+ svgCanvas.setStrokeOpacity(1.0);
+ $("#stroke_opacity").html("100 %");
+ }
+ } else {
+ fillPaint = paint;
+ if (svgCanvas.getFillColor() != color) {
+ svgCanvas.setFillColor(color);
+ }
+ if (color != 'none' && svgCanvas.getFillOpacity() != 1) {
+ svgCanvas.setFillOpacity(1.0);
+ $("#fill_opacity").html("100 %");
+ }
+ }
+ updateToolButtonState();
+ });
+
+ // This is a common function used when a tool has been clicked (chosen)
+ // It does several common things:
+ // - removes the tool_button_current class from whatever tool currently has it
+ // - hides any flyouts
+ // - adds the tool_button_current class to the button passed in
+ var toolButtonClick = function(button, fadeFlyouts) {
+ if ($(button).hasClass('tool_button_disabled')) return false;
+ var fadeFlyouts = fadeFlyouts || 'normal';
+ $('.tools_flyout').fadeOut(fadeFlyouts);
+ $('#styleoverrides').text('');
+ $('.tool_button_current').removeClass('tool_button_current').addClass('tool_button');
+ $(button).addClass('tool_button_current');
+ // when a tool is selected, we should deselect any currently selected elements
+ svgCanvas.clearSelection();
+ return true;
+ };
+
+ var addDropDown = function(elem, callback, dropUp) {
+ var button = $(elem).find('button');
+ var list = $(elem).find('ul');
+ var on_button = false;
+ if(dropUp) {
+ $(elem).addClass('dropup');
+ }
+
+ $(elem).find('li').bind('mouseup', callback);
+
+ $().mouseup(function(evt) {
+ if(!on_button) {
+ button.removeClass('down');
+ list.hide();
+ }
+ on_button = false;
+ });
+
+ button.bind('mousedown',function() {
+ if (!button.hasClass('down')) {
+ button.addClass('down');
+ list.show();
+ on_button = true;
+ } else {
+ button.removeClass('down');
+ list.hide();
+ }
+ }).hover(function() {
+ on_button = true;
+ }).mouseout(function() {
+ on_button = false;
+ });
+ }
+
+ addDropDown('#opacity_dropdown', function() {
+ if($(this).find('div').length) return;
+ var perc = parseInt($(this).text().split('%')[0]);
+ changeOpacity(false, perc);
+ });
+
+ // For slider usage, see: http://jqueryui.com/demos/slider/
+ $("#opac_slider").slider({
+ start: function() {
+ $('#opacity_dropdown li:not(.special)').hide();
+ },
+ stop: function() {
+ $('#opacity_dropdown li').show();
+ },
+ slide: function(evt, ui){
+ changeOpacity(ui);
+ }
+ });
+
+ addDropDown('#zoom_dropdown', function() {
+ var item = $(this);
+ var val = item.attr('data-val');
+ if(val) {
+ zoomChanged(window, val);
+ } else {
+ changeZoom({value:parseInt(item.text())});
+ }
+ }, true);
+
+ var clickSelect = function() {
+ if (toolButtonClick('#tool_select')) {
+ svgCanvas.setMode('select');
+ $('#styleoverrides').text('#svgcanvas svg *{cursor:move;pointer-events:all}, #svgcanvas svg{cursor:default}');
+ }
+ };
+
+ var clickFHPath = function() {
+ if (toolButtonClick('#tool_fhpath')) {
+ svgCanvas.setMode('fhpath');
+ }
+ };
+
+ var clickLine = function() {
+ if (toolButtonClick('#tool_line')) {
+ svgCanvas.setMode('line');
+ }
+ };
+
+ var clickSquare = function(){
+ if (toolButtonClick('#tools_rect_show', flyoutspeed)) {
+ flyoutspeed = 'normal';
+ svgCanvas.setMode('square');
+ }
+ $('#tools_rect_show').attr('src', 'images/square.png');
+ };
+
+ var clickRect = function(){
+ if (toolButtonClick('#tools_rect_show')) {
+ svgCanvas.setMode('rect');
+ }
+ $('#tools_rect_show').attr('src', 'images/rect.png');
+ };
+
+ var clickImage = function(){
+ if (toolButtonClick('#tool_image')) {
+ svgCanvas.setMode('image');
+ }
+ };
+
+ var clickZoom = function(){
+ if (toolButtonClick('#tool_zoom')) {
+ $('#workarea').css('cursor','crosshair');
+ svgCanvas.setMode('zoom');
+ }
+ };
+
+ var dblclickZoom = function(){
+ if (toolButtonClick('#tool_zoom')) {
+ var res = svgCanvas.getResolution();
+ setResolution(res.w, res.h);
+ $('#zoom').val(100);
+ svgCanvas.setZoom(1);
+ setSelectMode();
+ }
+ };
+
+ var clickFHRect = function(){
+ if (toolButtonClick('#tools_rect_show')) {
+ svgCanvas.setMode('fhrect');
+ }
+ $('#tools_rect_show').attr('src', 'images/freehand-square.png');
+ };
+
+ var clickCircle = function(){
+ if (toolButtonClick('#tools_ellipse_show', flyoutspeed)) {
+ flyoutspeed = 'normal';
+ svgCanvas.setMode('circle');
+ }
+ $('#tools_ellipse_show').attr('src', 'images/circle.png');
+ };
+
+ var clickEllipse = function(){
+ if (toolButtonClick('#tools_ellipse_show')) {
+ svgCanvas.setMode('ellipse');
+ }
+ $('#tools_ellipse_show').attr('src', 'images/ellipse.png');
+ };
+
+ var clickFHEllipse = function(){
+ if (toolButtonClick('#tools_ellipse_show')) {
+ svgCanvas.setMode('fhellipse');
+ }
+ $('#tools_ellipse_show').attr('src', 'images/freehand-circle.png');
+ };
+
+ var clickText = function(){
+ toolButtonClick('#tool_text');
+ svgCanvas.setMode('text');
+ };
+
+ var clickPath = function(){
+ toolButtonClick('#tool_path');
+ svgCanvas.setMode('path');
+ };
+
+ // Delete is a contextual tool that only appears in the ribbon if
+ // an element has been selected
+ var deleteSelected = function() {
+ if (selectedElement != null || multiselected) {
+ svgCanvas.deleteSelectedElements();
+ }
+ };
+
+ var moveToTopSelected = function() {
+ if (selectedElement != null) {
+ svgCanvas.moveToTopSelectedElement();
+ }
+ };
+
+ var moveToBottomSelected = function() {
+ if (selectedElement != null) {
+ svgCanvas.moveToBottomSelectedElement();
+ }
+ };
+
+ var moveSelected = function(dx,dy) {
+ if (selectedElement != null || multiselected) {
+ svgCanvas.moveSelectedElements(dx,dy);
+ }
+ };
+
+ var clonePathNode = function() {
+ if (svgCanvas.getNodePoint()) {
+ svgCanvas.clonePathNode();
+ }
+ };
+
+ var deletePathNode = function() {
+ if (svgCanvas.getNodePoint()) {
+ svgCanvas.deletePathNode();
+ }
+ };
+
+ var selectNext = function() {
+ svgCanvas.cycleElement(1);
+ }
+
+ var selectPrev = function() {
+ svgCanvas.cycleElement(0);
+ }
+
+ var rotateSelected = function(cw) {
+ if (selectedElement == null || multiselected) return;
+ var step = 5;
+ if(!cw) step *= -1;
+ var new_angle = $('#angle').val()*1 + step;
+ svgCanvas.setRotationAngle(new_angle);
+ }
+
+ var clickClear = function(){
+ // TODO: localize this prompt
+ if( confirm('Do you want to clear the drawing?\nThis will also erase your undo history!') ) {
+ svgCanvas.clear();
+ updateContextPanel();
+ }
+ };
+
+ var clickBold = function(){
+ svgCanvas.setBold( !svgCanvas.getBold() );
+ updateContextPanel();
+ };
+
+ var clickItalic = function(){
+ svgCanvas.setItalic( !svgCanvas.getItalic() );
+ updateContextPanel();
+ };
+
+ var clickSave = function(){
+ svgCanvas.save();
+ };
+
+ var clickOpen = function(){
+ svgCanvas.open();
+ };
+
+ var clickUndo = function(){
+ if (svgCanvas.getUndoStackSize() > 0) {
+ svgCanvas.undo();
+ populateLayers();
+ }
+ };
+
+ var clickRedo = function(){
+ if (svgCanvas.getRedoStackSize() > 0) {
+ svgCanvas.redo();
+ populateLayers();
+ }
+ };
+
+ var clickGroup = function(){
+ // group
+ if (multiselected) {
+ svgCanvas.groupSelectedElements();
+ }
+ // ungroup
+ else {
+ svgCanvas.ungroupSelectedElement();
+ }
+ };
+
+ var clickClone = function(){
+ svgCanvas.cloneSelectedElements();
+ };
+
+ var clickAlignLeft = function(){
+ svgCanvas.alignSelectedElements('l', $('#align_relative_to option:selected').val() );
+ };
+ var clickAlignCenter = function(){
+ svgCanvas.alignSelectedElements('c', $('#align_relative_to option:selected').val() );
+ };
+ var clickAlignRight = function(){
+ svgCanvas.alignSelectedElements('r', $('#align_relative_to option:selected').val() );
+ };
+ var clickAlignTop = function(){
+ svgCanvas.alignSelectedElements('t', $('#align_relative_to option:selected').val() );
+ };
+ var clickAlignMiddle = function(){
+ svgCanvas.alignSelectedElements('m', $('#align_relative_to option:selected').val() );
+ };
+ var clickAlignBottom = function(){
+ svgCanvas.alignSelectedElements('b', $('#align_relative_to option:selected').val() );
+ };
+
+ var zoomImage = function(zoomIn) {
+ var res = svgCanvas.getResolution();
+ var multiplier = zoomIn? res.zoom * 2 : res.zoom * 0.5;
+ setResolution(res.w * multiplier, res.h * multiplier, true);
+ $('#zoom').val(multiplier * 100);
+ svgCanvas.setZoom(multiplier);
+ };
+
+ var clickWireframe = function() {
+ $('#tool_wireframe').toggleClass('push_button_pressed');
+ $('#workarea').toggleClass('wireframe');
+ }
+
+ var showSourceEditor = function(){
+ if (editingsource) return;
+ editingsource = true;
+ var str = svgCanvas.getSvgString();
+ $('#svg_source_textarea').val(str);
+ $('#svg_source_editor').fadeIn();
+ properlySourceSizeTextArea();
+ $('#svg_source_textarea').focus();
+ };
+
+ var showDocProperties = function(){
+ if (docprops) return;
+ docprops = true;
+
+ // update resolution option with actual resolution
+ // TODO: what if SVG source is changed?
+ var res = svgCanvas.getResolution();
+ $('#canvas_width').val(res.w);
+ $('#canvas_height').val(res.h);
+ $('#canvas_title').val(svgCanvas.getImageTitle());
+
+ // Update background color with current one
+ var blocks = $('#bg_blocks div');
+ var cur_bg = 'cur_background';
+ var canvas_bg = $('#svgcanvas').css('background');
+ var url = canvas_bg.match(/url\("?(.*?)"?\)/);
+ if(url) url = url[1];
+ blocks.each(function() {
+ var blk = $(this);
+ var is_bg = blk.css('background') == canvas_bg;
+ blk.toggleClass(cur_bg, is_bg);
+ if(is_bg) $('#canvas_bg_url').removeClass(cur_bg);
+ });
+ if(!canvas_bg) blocks.eq(0).addClass(cur_bg);
+ if(!$('#bg_blocks .' + cur_bg).length && url) {
+ $('#canvas_bg_url').val(url);
+ }
+
+ $('#svg_docprops').fadeIn();
+ };
+
+ var properlySourceSizeTextArea = function(){
+ // TODO: remove magic numbers here and get values from CSS
+ var height = $('#svg_source_container').height() - 80;
+ $('#svg_source_textarea').css('height', height);
+ };
+
+ var saveSourceEditor = function(){
+ if (!editingsource) return;
+
+ if (!svgCanvas.setSvgString($('#svg_source_textarea').val())) {
+ // TODO: localize this prompt
+ if( !confirm('There were parsing errors in your SVG source.\nRevert back to original SVG source?') ) {
+ return false;
+ }
+ }
+ svgCanvas.clearSelection();
+ hideSourceEditor();
+ populateLayers();
+ };
+
+ var saveDocProperties = function(){
+ // set title
+ svgCanvas.setImageTitle($('#canvas_title').val());
+
+ // update resolution
+ var x = parseInt($('#canvas_width').val());
+ var y = parseInt($('#canvas_height').val());
+ if(isNaN(x) || isNaN(y)) {
+ x ='fit';
+ }
+ if(!svgCanvas.setResolution(x,y)) {
+ alert('No content to fit to');
+ return false;
+ }
+
+ // set background
+ var new_bg, bg_url = $('#canvas_bg_url').val();
+ var bg_blk = $('#bg_blocks div.cur_background');
+ if(bg_blk.length) {
+ new_bg = bg_blk.css('background');
+ $('#svgcanvas').css('background',new_bg);
+ $('#background_img').remove();
+ } else if(bg_url) {
+ if(!$('#background_img').length) {
+ $('
+
+
+
-
+
@@ -362,13 +586,13 @@ script type="text/javascript" src="locale/locale.min.js">
-
+
-
+
-
+
@@ -391,11 +615,11 @@ script type="text/javascript" src="locale/locale.min.js">
+
+
-
+
-
+
@@ -391,11 +615,11 @@ script type="text/javascript" src="locale/locale.min.js">
-
+
-
-
+
+
@@ -409,17 +633,17 @@ script type="text/javascript" src="locale/locale.min.js">
-
+
+
-
-
+
+
@@ -409,17 +633,17 @@ script type="text/javascript" src="locale/locale.min.js">
-
+
-
-
+
+
-
+
+
-
+
@@ -433,7 +657,7 @@ script type="text/javascript" src="locale/locale.min.js">
+
@@ -433,7 +657,7 @@ script type="text/javascript" src="locale/locale.min.js">
-
+
@@ -447,7 +671,7 @@ script type="text/javascript" src="locale/locale.min.js">
+
@@ -447,7 +671,7 @@ script type="text/javascript" src="locale/locale.min.js">
-
+
@@ -457,7 +681,7 @@ script type="text/javascript" src="locale/locale.min.js">
+
@@ -457,7 +681,7 @@ script type="text/javascript" src="locale/locale.min.js">
-
+
@@ -469,7 +693,7 @@ script type="text/javascript" src="locale/locale.min.js">
+
@@ -469,7 +693,7 @@ script type="text/javascript" src="locale/locale.min.js">
-
+
@@ -481,7 +705,7 @@ script type="text/javascript" src="locale/locale.min.js">
+
@@ -481,7 +705,7 @@ script type="text/javascript" src="locale/locale.min.js">
-
+
@@ -501,7 +725,7 @@ script type="text/javascript" src="locale/locale.min.js">
+
@@ -501,7 +725,7 @@ script type="text/javascript" src="locale/locale.min.js">
-
+
@@ -552,19 +776,19 @@ script type="text/javascript" src="locale/locale.min.js">
1000%
-
+
@@ -552,19 +776,19 @@ script type="text/javascript" src="locale/locale.min.js">
+
| fill: | +fill: | - | 100% |
+ 100% |
||||||||||||||||||
| stroke: | +stroke: | - | 100 % |
+ 100 % |
@@ -659,6 +883,7 @@ script type="text/javascript" src="locale/locale.min.js"> + diff --git a/editor/svg-editor.css b/editor/svg-editor.css index 99925f5b..563ebaf9 100644 --- a/editor/svg-editor.css +++ b/editor/svg-editor.css @@ -47,11 +47,20 @@ body { margin-top: 2px; } +#svg_editor #stroke_bg, +#svg_editor #fill_bg { + height: 16px; + width: 16px; + margin: 2px; +} + #svg_editor #fill_color, #svg_editor #stroke_color { height: 16px; width: 16px; border: 1px solid #808080; cursor: pointer; + margin-top: -19px; + margin-left: 1px; } #svg_editor div#palette { @@ -138,6 +147,7 @@ body { border-bottom: 1px solid #FFFFFF; border-left: 1px solid #808080; border-top: 1px solid #808080; + overflow: auto; } #svg_editor .layer_button { @@ -149,6 +159,8 @@ body { border-right: 1px solid #808080; border-bottom: 1px solid #808080; cursor: pointer; + float: left; + margin-right: 3px; } #svg_editor .layer_buttonpressed { @@ -182,9 +194,6 @@ body { } #svg_editor #layerlist td.layervis { - background-image: url('images/eye.png'); - background-repeat: no-repeat; - background-position: 3px center; width: 22px; cursor:pointer; } @@ -193,6 +202,14 @@ body { cursor:pointer; } +#svg_editor #layerlist td.layervis * { + display: block; +} + +#svg_editor #layerlist td.layerinvis * { + display: none; +} + #svg_editor #layerlist td.layername { cursor: pointer; } @@ -311,6 +328,7 @@ body { position: relative; top: -13px; left: -5px; + margin-top: -3px; margin-bottom: -13px; } @@ -331,8 +349,7 @@ span.zoom_tool { position: relative; } -.dropdown button { - background: transparent 3px 8px url('images/dropdown.gif') no-repeat; +#svg_editor .dropdown button { width: 15px; height: 21px; margin: 6px 0 0 1px; @@ -422,13 +439,37 @@ span.zoom_tool { } #svg_editor .tool_sep { - width: 2px; + width: 1px; + background: #888; + border-left: 1px outset #EEE; + margin: 2px 3px; + padding: 0; height: 24px; - margin: 2px; - margin-right: 0; - padding: 2px; + } +#tool_bold, #tool_italic { + font: bold 2.1em/1.1em serif; + text-align: center; + padding-left: 2px; + position: relative; +} + +#tool_bold span, #tool_italic span { + position: absolute; + width: 100%; + height: 100%; + top: 0; left: 0; + background: #000; + opacity: 0; +} + +#tool_italic { + font-weight: normal; + font-style: italic; +} + + #svg_editor #color_picker { position: absolute; display: none; @@ -449,22 +490,6 @@ span.zoom_tool { width: 30px; } -#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-top.png') no-repeat; } -#svg_editor #tool_alignmiddle { background: 2px 2px url('images/align-middle.png') no-repeat; } -#svg_editor #tool_alignbottom { background: 2px 2px url('images/align-bottom.png') no-repeat; } -#svg_editor #tool_alignleft { background: 2px 2px url('images/align-left.png') no-repeat; } -#svg_editor #tool_aligncenter { background: 2px 2px url('images/align-center.png') no-repeat; } -#svg_editor #tool_alignright { background: 2px 2px url('images/align-right.png') no-repeat; } -#svg_editor .tool_sep { background: 2px 2px url('images/sep.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 { @@ -539,6 +564,7 @@ span.zoom_tool { background-color: #B0B0B0; opacity: 1.0; text-align: center; + border: 1px outset #777; } /* @@ -548,22 +574,52 @@ span.zoom_tool { bottom: 100px; */ + + #svg_docprops #svg_docprops_container { position: absolute; top: 50px; padding: 10px; background-color: #B0B0B0; + border: 1px outset #777; opacity: 1.0; +/* width: 450px;*/ + font-family: Verdana, Helvetica, sans-serif; + font-size: .8em; } +#tool_docprops_back { + margin-left: 1em; +} + +#svg_docprops_container #svg_docprops_docprops, +#svg_docprops_container #svg_docprops_prefs { + float: left; + width: 200px; + margin: 5px .7em; +} + +#svg_docprops_docprops > legend, #svg_docprops_prefs > legend { + font-weight: bold; + font-size: 1.1em; +} + + #svg_docprops_container fieldset { padding: 5px; margin: 5px; + border: 1px solid #DDD; } #svg_docprops_container label { display: block; - margin-bottom: .2em; + margin: .5em; +} + +#svginfo_bg_note { + font-size: .9em; + font-style: italic; + color: #444; } #canvas_title { @@ -595,15 +651,6 @@ span.zoom_tool { padding: 18px; } -#change_background input { - color: #888; -} - -#change_background input.cur_background { - border: 2px solid blue; - color: #000; -} - #background_img { position: absolute; top: 0; @@ -635,21 +682,25 @@ span.zoom_tool { opacity: 0.6; } -#tool_source_save, #tool_docprops_save { - background: #E8E8E8 url(images/save.png) no-repeat 2px 0; +button#tool_source_save, +button#tool_source_cancel, +button#tool_docprops_save, +button#tool_docprops_cancel { + border:1px solid #dedede; + line-height:130%; + background: #E8E8E8 none; + padding:5px 10px 5px 7px; /* Firefox */ + line-height:17px; /* Safari */ } -#tool_source_cancel, #tool_docprops_cancel { - background: #E8E8E8 url(images/cancel.png) no-repeat 2px 0; +.toolbar_button button .svg_icon { + margin:0 3px -3px 0 !important; + padding:0; + border:none; + width:16px; + height:16px; } -#tool_source_save, #tool_docprops_save { - background: #E8E8E8 url(images/save.png) no-repeat 2px 0; -} - -#tool_source_cancel, #tool_docprops_cancel { - background: #E8E8E8 url(images/cancel.png) no-repeat 2px 0; -} /* Slider ----------------------------------*/ @@ -676,4 +727,12 @@ span.zoom_tool { .ui-slider-handle { background: #B0B0B0; border: 1px solid #000; -} \ No newline at end of file +} + +/* Possibly not necessary */ +#svg_editor #tools_rect .tool_flyout_button, +#svg_editor #tools_ellipse .tool_flyout_button { + padding: 2px; + width: 24px; + height: 24px; +} diff --git a/editor/svg-editor.html b/editor/svg-editor.html index d01f8e45..c58a7aca 100644 --- a/editor/svg-editor.html +++ b/editor/svg-editor.html @@ -13,12 +13,12 @@ + - | |||||||||||||||||
| fill: | -- | 100% |
+ fill: | ++ | 100% |
||||
| stroke: | -- | 100 % |
+ stroke: | ++ | 100 % |
@@ -330,14 +329,14 @@ script type="text/javascript" src="locale/locale.min.js"> | |||