From 676272ccc08529fbe794bdba604e3cb48b2bd8e6 Mon Sep 17 00:00:00 2001 From: Paulo Gustavo Veiga Date: Mon, 19 Mar 2012 23:56:01 -0300 Subject: [PATCH] Configure shortcuts based on platform. --- mindplot/src/main/javascript/widget/Menu.js | 3 ++- wise-editor/src/main/webapp/css/header.less | 2 ++ wise-editor/src/main/webapp/css/toolbar.less | 1 + wise-editor/src/main/webapp/html/editor.html | 3 +-- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/mindplot/src/main/javascript/widget/Menu.js b/mindplot/src/main/javascript/widget/Menu.js index 67a1f5e2..97429bd0 100644 --- a/mindplot/src/main/javascript/widget/Menu.js +++ b/mindplot/src/main/javascript/widget/Menu.js @@ -59,7 +59,7 @@ mindplot.widget.Menu = new Class({ } }; this._toolbarElems.push(new mindplot.widget.FontFamilyPanel("fontFamily", fontFamilyModel)); - this._registerTooltip('fontFamily', "Text type"); + this._registerTooltip('fontFamily', "Text font"); var fontSizeModel = { @@ -454,6 +454,7 @@ mindplot.widget.Menu = new Class({ if ($(buttonId)) { var tooltip = text; if (shortcut) { + 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/header.less b/wise-editor/src/main/webapp/css/header.less index 4d602ce3..12da0406 100644 --- a/wise-editor/src/main/webapp/css/header.less +++ b/wise-editor/src/main/webapp/css/header.less @@ -25,6 +25,8 @@ div#headerInfo { width: 100%; height: @header-info-height; color: white; + padding: 0px 18px + } div#headerActions { diff --git a/wise-editor/src/main/webapp/css/toolbar.less b/wise-editor/src/main/webapp/css/toolbar.less index 91f5c286..696a697c 100644 --- a/wise-editor/src/main/webapp/css/toolbar.less +++ b/wise-editor/src/main/webapp/css/toolbar.less @@ -10,6 +10,7 @@ div#toolbar { background-image: -webkit-gradient(linear, left bottom, left top, color-stop(0.47, rgb(229, 227, 209)), color-stop(0.87, rgb(252, 250, 237))); border-bottom: 3px double rgb(190, 190, 190); border-top: 1px solid rgb(190, 190, 190); + padding: 0px 15px; } div#toolbar .buttonContainer { diff --git a/wise-editor/src/main/webapp/html/editor.html b/wise-editor/src/main/webapp/html/editor.html index 2f546168..3539f0ee 100644 --- a/wise-editor/src/main/webapp/html/editor.html +++ b/wise-editor/src/main/webapp/html/editor.html @@ -4,8 +4,7 @@ WiseMapping - Editor - +