From 9213dc6aa38e10940ddafe4db5ff9f51de9e14c3 Mon Sep 17 00:00:00 2001 From: Paulo Gustavo Veiga Date: Sun, 24 Jun 2012 20:53:31 -0300 Subject: [PATCH] - Fix Explorer toolbar color --- mindplot/src/main/javascript/widget/Menu.js | 2 +- wise-editor/src/main/webapp/css/editor.less | 1 + wise-editor/src/main/webapp/css/toolbar.less | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/mindplot/src/main/javascript/widget/Menu.js b/mindplot/src/main/javascript/widget/Menu.js index 62669247..d70d07af 100644 --- a/mindplot/src/main/javascript/widget/Menu.js +++ b/mindplot/src/main/javascript/widget/Menu.js @@ -475,7 +475,7 @@ mindplot.widget.Menu = new Class({ if ($(buttonId)) { var tooltip = text; if (shortcut) { - shortcut = Browser.Platform.mac ? shortcut.replace("meta+", "⌘") : shortcut.replace("meta+", "ctrl"); + shortcut = Browser.Platform.mac ? shortcut.replace("meta+", "⌘") : shortcut.replace("meta+", "ctrl+"); tooltip = tooltip + " (" + shortcut + ")"; } new mindplot.widget.KeyboardShortcutTooltip($(buttonId), tooltip); diff --git a/wise-editor/src/main/webapp/css/editor.less b/wise-editor/src/main/webapp/css/editor.less index e699e392..1c4f9a36 100644 --- a/wise-editor/src/main/webapp/css/editor.less +++ b/wise-editor/src/main/webapp/css/editor.less @@ -17,6 +17,7 @@ div#mindplot { width: 100%; height:100%; border: 0; + overflow: hidden; } div#small_error_icon { diff --git a/wise-editor/src/main/webapp/css/toolbar.less b/wise-editor/src/main/webapp/css/toolbar.less index 696a697c..0129fd5d 100644 --- a/wise-editor/src/main/webapp/css/toolbar.less +++ b/wise-editor/src/main/webapp/css/toolbar.less @@ -1,6 +1,7 @@ div#toolbar { width: 100%; height: @header-toolbar-height; + background-color: rgb(229, 227, 209); background-image: linear-gradient(bottom, rgb(229, 227, 209) 47%, rgb(252, 250, 237) 87%); background-image: -o-linear-gradient(bottom, rgb(229, 227, 209) 47%, rgb(252, 250, 237) 87%); background-image: -moz-linear-gradient(bottom, rgb(229, 227, 209) 47%, rgb(252, 250, 237) 87%);