From b6970bf6db16b8b8807733afbad362fc61d165e9 Mon Sep 17 00:00:00 2001 From: Alexis Deveria Date: Fri, 4 Sep 2009 13:25:35 +0000 Subject: [PATCH] Fixed Issue 164: Colorpicker doesn't display correctly on Firefox 1.5.x by updating to latest version of jGraduate git-svn-id: http://svg-edit.googlecode.com/svn/trunk@558 eee81c28-f429-11dd-99c0-75d572ba1ddd --- editor/jgraduate/css/jGraduate-0.2.0.css | 25 ++++++++++++++---------- editor/jgraduate/jquery.jgraduate.js | 5 +++-- 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/editor/jgraduate/css/jGraduate-0.2.0.css b/editor/jgraduate/css/jGraduate-0.2.0.css index ffa0e9aa..4b86287a 100644 --- a/editor/jgraduate/css/jGraduate-0.2.0.css +++ b/editor/jgraduate/css/jGraduate-0.2.0.css @@ -52,6 +52,7 @@ li.jGraduate_tab_current { display: none; border: outset 1px #666; padding: 10px 7px 5px 5px; + overflow: auto; } .jGraduate_tabs { @@ -63,7 +64,7 @@ li.jGraduate_tab_current { } div.jGraduate_Swatch { - display: inline-block; + float: left; margin: 8px; } div.jGraduate_GradContainer { @@ -90,13 +91,13 @@ div.jGraduate_Opacity { } div.jGraduate_OpacityField { - margin-top: 110px; - margin-left: -10px; + position: absolute; + bottom: 25px; + left: 292px; } div.jGraduate_Form { - display: inline-block; - vertical-align: top; + float: left; width: 140px; margin: -3px 3px 0px 4px; } @@ -107,8 +108,7 @@ div.jGraduate_StopSection { } div.jGraduate_OkCancel { - display: inline-block; - vertical-align: top; + float: left; width: 113px; } @@ -123,13 +123,17 @@ input.jGraduate_Ok { } .colorBox { - display: inline-block; + float: left; height: 16px; width: 16px; border: 1px solid #808080; - vertical-align: -7px; cursor: pointer; - margin: 4px; + margin: 4px 4px 4px 30px; +} + +.colorBox + label { + float: left; + margin-top: 7px; } label.jGraduate_Form_Heading { @@ -151,6 +155,7 @@ div.jGraduate_Form_Section { margin: 2px; width: 110px; text-align: center; + overflow: auto; } div.jGraduate_LightBox { diff --git a/editor/jgraduate/jquery.jgraduate.js b/editor/jgraduate/jquery.jgraduate.js index 653f1d5b..1218d60d 100644 --- a/editor/jgraduate/jquery.jgraduate.js +++ b/editor/jgraduate/jquery.jgraduate.js @@ -387,8 +387,9 @@ jQuery.fn.jGraduate = // handle dragging the stop around the swatch var draggingStop = null; var startx = -1, starty = -1; - // for whatever reason, Opera does not allow $('image.stop') here - $('.stop').mousedown(function(evt) { + // for whatever reason, Opera does not allow $('image.stop') here, + // and Firefox 1.5 does not allow $('.stop') + $('.stop, #gradPicker_jgraduate_svg image').mousedown(function(evt) { draggingStop = this; startx = evt.clientX; starty = evt.clientY;