From 2921c666466fcbf542467ef2a12f977251dab654 Mon Sep 17 00:00:00 2001 From: Alexis Deveria Date: Wed, 13 Jan 2010 17:18:53 +0000 Subject: [PATCH] Made more improvements to main menu (works OK on icon size changes now) git-svn-id: http://svg-edit.googlecode.com/svn/trunk@1210 eee81c28-f429-11dd-99c0-75d572ba1ddd --- editor/svg-editor.css | 15 +++++++++------ editor/svg-editor.html | 4 ++-- editor/svg-editor.js | 8 ++++++-- 3 files changed, 17 insertions(+), 10 deletions(-) diff --git a/editor/svg-editor.css b/editor/svg-editor.css index 65ce248f..e83fab42 100644 --- a/editor/svg-editor.css +++ b/editor/svg-editor.css @@ -239,9 +239,16 @@ } #svg_editor #main_icon { - padding: 0px; + position: relative; + top: -2px; + left: -2px; + padding: 1px 0 2px 1px; width: 44px; height: 30px; + border-left: 1px solid #EEE; + border-top: 1px solid #EEE; + border-right: 1px solid #CCC; + border-bottom: 1px solid #CCC; border-radius: 8px; -moz-border-radius: 8px; -webkit-border-radius: 8px; @@ -249,10 +256,6 @@ #svg_editor #main_icon:hover, #svg_editor #main_icon.down { - top: -2px; - left: -2px; - position: relative; - padding: 1px 0 2px 1px; border-left: 1px #fcd9ba solid; border-top: 1px #fcd9ba solid; border-right: 1px #e0a874 solid; @@ -333,7 +336,7 @@ } #svg_editor #main_button .dropdown { - padding-top: 10px; + padding-top: 28%; margin-left: -1px; } diff --git a/editor/svg-editor.html b/editor/svg-editor.html index 6e56255f..5b1d057d 100644 --- a/editor/svg-editor.html +++ b/editor/svg-editor.html @@ -74,8 +74,8 @@ script type="text/javascript" src="locale/locale.min.js">
L a y e r s
-
-
+
+
diff --git a/editor/svg-editor.js b/editor/svg-editor.js index 186414f4..33d2b20d 100644 --- a/editor/svg-editor.js +++ b/editor/svg-editor.js @@ -763,7 +763,7 @@ function svg_edit_setup() { }).mouseout(function() { on_button = false; }); - }()); +}()); var addDropDown = function(elem, callback, dropUp) { var button = $(elem).find('button'); @@ -1287,8 +1287,12 @@ function svg_edit_setup() { 'height': {s: '16px', l: '32px', xl: '48px'}, 'margin': {s: '2px 2px', l: '2px 5px', xl: '2px 8px'} }, + "#main_icon": { + 'width': {s: '31px', l: '53px', xl: '75px'}, + 'height': {s: '22px', l: '42px', xl: '64px'} + }, "#tools_top": { - 'left': {s: '35px', l: '50px', xl: '70px'}, + 'left': {s: '36px', l: '60px', xl: '80px'}, 'height': {s: '50px', l: '88px', xl: '125px'} }, "#tools_left": {