From 1df9afda1b8fff1b969ae8377f48acf779ab3944 Mon Sep 17 00:00:00 2001 From: Paulo Gustavo Veiga Date: Mon, 2 Jul 2012 00:37:48 -0300 Subject: [PATCH] Change default font style. --- mindplot/src/main/javascript/widget/Menu.js | 2 +- mindplot/src/main/javascript/widget/colorPalette.css | 11 ++++++----- wise-editor/src/main/webapp/css/compatibility.less | 9 +++++---- wise-editor/src/main/webapp/css/header.less | 2 +- wise-webapp/src/main/webapp/css/pageHeaders.css | 4 ++-- wise-webapp/src/main/webapp/jsp/mindmapList.jsp | 5 +++-- 6 files changed, 18 insertions(+), 15 deletions(-) diff --git a/mindplot/src/main/javascript/widget/Menu.js b/mindplot/src/main/javascript/widget/Menu.js index bfb7ea16..454e8349 100644 --- a/mindplot/src/main/javascript/widget/Menu.js +++ b/mindplot/src/main/javascript/widget/Menu.js @@ -260,7 +260,7 @@ mindplot.widget.Menu = new Class({ this._addButton('deleteTopic', true, true, function () { designer.deleteCurrentNode(); }); - this._registerTooltip('deleteTopic', $msg('TOPIC_DELETE'), "Backspace"); + this._registerTooltip('deleteTopic', $msg('TOPIC_DELETE'), "Delete"); this._addButton('topicLink', true, false, function () { diff --git a/mindplot/src/main/javascript/widget/colorPalette.css b/mindplot/src/main/javascript/widget/colorPalette.css index 64880491..0a3d2919 100644 --- a/mindplot/src/main/javascript/widget/colorPalette.css +++ b/mindplot/src/main/javascript/widget/colorPalette.css @@ -1,15 +1,16 @@ .palette-panel { - /*background: white;*/ - /*border-color: #CCC #666 #666 #CCC;*/ - /*border-style: solid;*/ - /*border-width: 1px;*/ cursor: default; - font: normal 13px Arial, sans-serif; + font: normal 13px "Helvetica Neue", Helvetica, Arial, sans-serif; margin: 0; outline: none; padding: 4px 0; z-index: 20000; + -webkit-touch-callout: none; -webkit-user-select: none; + -khtml-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; } .palette { diff --git a/wise-editor/src/main/webapp/css/compatibility.less b/wise-editor/src/main/webapp/css/compatibility.less index cab9e3ec..04c7ed25 100644 --- a/wise-editor/src/main/webapp/css/compatibility.less +++ b/wise-editor/src/main/webapp/css/compatibility.less @@ -48,7 +48,8 @@ abbr, acronym { * */ body { - font: 13px arial, helvetica, clean, sans-serif; + font-size: 13px; + font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-size: small; font: x-small; } @@ -88,7 +89,7 @@ body * { } body { - font: normal 80% "trebuchet ms", verdana, arial, helvetica, sans-serif; + font: normal 80% "Helvetica Neue",Helvetica,Arial,sans-serif; background-color: #fff; } @@ -134,7 +135,7 @@ h1 { } h3 { - /* use as subhead on main body */ +/* use as subhead on main body */ clear: left; font-style: normal; font-size: 130%; @@ -142,7 +143,7 @@ h3 { } h4 { - /* use as headers in footer */ +/* use as headers in footer */ font-weight: bold; font-size: 120%; border-bottom: 1px solid #8e9181; diff --git a/wise-editor/src/main/webapp/css/header.less b/wise-editor/src/main/webapp/css/header.less index 213d33b7..1b96fa00 100644 --- a/wise-editor/src/main/webapp/css/header.less +++ b/wise-editor/src/main/webapp/css/header.less @@ -95,5 +95,5 @@ div#embFooter { left: 0; border-top: 1px solid black; background: #E5E5E5; - font-family: Arial; + font-family: "Helvetica Neue",Helvetica,Arial,sans-serif; } diff --git a/wise-webapp/src/main/webapp/css/pageHeaders.css b/wise-webapp/src/main/webapp/css/pageHeaders.css index 1d88919c..f3676582 100644 --- a/wise-webapp/src/main/webapp/css/pageHeaders.css +++ b/wise-webapp/src/main/webapp/css/pageHeaders.css @@ -11,7 +11,7 @@ } #headerToolbar { - height: 25px; + height: 30px; width: 100%; background-color: #171a17; border-top: 1px solid #999999; @@ -31,7 +31,7 @@ } #headerLogo { - margin-top: 13px; + margin-top: 18px; height: 80px; width: 160px; background: url("../images/logo-medium.png") no-repeat; diff --git a/wise-webapp/src/main/webapp/jsp/mindmapList.jsp b/wise-webapp/src/main/webapp/jsp/mindmapList.jsp index 45744992..8bbabc57 100644 --- a/wise-webapp/src/main/webapp/jsp/mindmapList.jsp +++ b/wise-webapp/src/main/webapp/jsp/mindmapList.jsp @@ -81,10 +81,11 @@ oLanguage:{ "sLengthMenu":"", "sSearch":"", - "sZeroRecords": "", + "sZeroRecords":"", "sLoadingRecords":"", "sInfo":"", - "sEmptyTable":"" + "sEmptyTable":"", + "sProcessing":"" }, bStateSave:true });