diff --git a/editor/svg-editor.css b/editor/svg-editor.css index a889c31a..a56e6035 100644 --- a/editor/svg-editor.css +++ b/editor/svg-editor.css @@ -1,4 +1,4 @@ -body { +body { background: #D0D0D0; } @@ -222,29 +222,19 @@ html, body, div{ border-width: 1px; border-left: none; } - #svg_editor #sidepanels #toolpalettes{ + +#svg_editor #layerpanel { display: inline-block; position:absolute; - padding: 10px; - top: 0; - bottom: 0; - right: 0; - left:0; - overflow-y:auto; - overflow-x:hidden; - display:none; -} - -#svg_editor #sidepanels .toolpalette{ - padding-left:10px; - margin-right:10px; - margin-bottom:10px; - display:none; + top: 1px; + bottom: 0px; + right: 0px; + width: 0px; overflow: auto; + margin: 0px; -moz-user-select: none; -webkit-user-select: none; - border-top:2px solid gray; - width:100%; + } /* diff --git a/editor/svg-editor.html b/editor/svg-editor.html index c472c8ae..8dce445a 100644 --- a/editor/svg-editor.html +++ b/editor/svg-editor.html @@ -55,48 +55,6 @@ SVG-edit - -
@@ -123,8 +81,7 @@
-
-
+

Layers

@@ -146,41 +103,7 @@
-
-

Sample Palette

-
-
    -
  • Alligator
    • -
  • Bear
    • -
  • Catfish
    • -
  • Donkey
    • -
  • Eagle
    • -
  • Firemouth
    • -
  • Gecko
    • -
  • Hippopotomus
    • -
  • Ibex
    • -
  • Jaguar
    • -
  • Komodo Dragon
    • -
  • Lobster
    • -
  • Mouse
    • -
  • Narwhal
    • -
  • Octopus
    • -
  • Possum
    • -
  • Quail
    • -
  • Rhinoceros
    • -
  • Snake
    • -
  • Turtle
    • -
  • Unicorn
    • -
  • Velociraptor
    • -
  • Warthog
    • -
  • Xeme
    • -
  • Yak
    • -
  • Zebra
    • -
-
-
-
-
P a l e t t e s
+
L a y e r s
diff --git a/editor/svg-editor.js b/editor/svg-editor.js index cd46b2e2..d720af3d 100644 --- a/editor/svg-editor.js +++ b/editor/svg-editor.js @@ -3744,7 +3744,7 @@ }); var SIDEPANEL_MAXWIDTH = 300; - var SIDEPANEL_OPENWIDTH = 300; + var SIDEPANEL_OPENWIDTH = 150; var sidedrag = -1, sidedragging = false, allowmove = false; var resizePanel = function(evt) { @@ -3801,15 +3801,13 @@ // the optional close argument forces the side panel closed var toggleSidePanel = function(close){ var w = parseInt($('#sidepanels').css('width')); - var alreadyOpen = w > 2; - var deltax = (alreadyOpen || close ? 2 : SIDEPANEL_OPENWIDTH) - w; + var deltax = (w > 2 || close ? 2 : SIDEPANEL_OPENWIDTH) - w; var sidepanels = $('#sidepanels'); - var palettes = $('.toolpalette'); + var layerpanel = $('#layerpanel'); var ruler_x = $('#ruler_x'); workarea.css('right', parseInt(workarea.css('right')) + deltax); sidepanels.css('width', parseInt(sidepanels.css('width')) + deltax); - palettes.css('display', alreadyOpen ? 'none':'inherit'); - $('#toolpalettes').css('display', alreadyOpen ? 'none':'inherit'); + layerpanel.css('width', parseInt(layerpanel.css('width')) + deltax); ruler_x.css('right', parseInt(ruler_x.css('right')) + deltax); }; diff --git a/test/svgtransformlist_test.html b/test/svgtransformlist_test.html index df697cf7..8fead9f8 100644 --- a/test/svgtransformlist_test.html +++ b/test/svgtransformlist_test.html @@ -24,7 +24,7 @@ var svgroot = document.getElementById('svgroot'); var svgcontent, rect, circle; - var NEAR_ZERO = 5e-6; // 0.000005, Firefox fails at higher levels of precision. + var NEAR_ZERO = 1e-7; function almostEquals(a, b, msg) { msg = msg || (a + ' did not equal ' + b); ok(Math.abs(a - b) < NEAR_ZERO, msg);