From af6be7f7dbdcdc8870393204b527f1fbea008498 Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Wed, 8 Aug 2018 11:50:20 +1200 Subject: Use FontAwesome from ExtJS --- web/app/view/DeviceMenu.js | 2 +- web/app/view/SettingsMenu.js | 2 +- web/app/view/edit/Groups.js | 2 +- web/app/view/edit/Users.js | 2 +- web/load.js | 2 -- 5 files changed, 4 insertions(+), 6 deletions(-) diff --git a/web/app/view/DeviceMenu.js b/web/app/view/DeviceMenu.js index a3381cc4..c9416845 100644 --- a/web/app/view/DeviceMenu.js +++ b/web/app/view/DeviceMenu.js @@ -33,7 +33,7 @@ Ext.define('Traccar.view.DeviceMenu', { items: [{ text: Strings.sharedDrivers, - glyph: 'xf2c2@FontAwesome', + glyph: 'xf084@FontAwesome', handler: 'onDriversClick', reference: 'menuDriversButton' }, { diff --git a/web/app/view/SettingsMenu.js b/web/app/view/SettingsMenu.js index 01a06aa6..309133c1 100644 --- a/web/app/view/SettingsMenu.js +++ b/web/app/view/SettingsMenu.js @@ -45,7 +45,7 @@ Ext.define('Traccar.view.SettingsMenu', { }, { hidden: true, text: Strings.sharedDrivers, - glyph: 'xf2c2@FontAwesome', + glyph: 'xf084@FontAwesome', handler: 'onDriversClick', reference: 'settingsDriversButton' }, { diff --git a/web/app/view/edit/Groups.js b/web/app/view/edit/Groups.js index 1ff4de80..06974201 100644 --- a/web/app/view/edit/Groups.js +++ b/web/app/view/edit/Groups.js @@ -51,7 +51,7 @@ Ext.define('Traccar.view.edit.Groups', { disabled: true, handler: 'onDriversClick', reference: 'toolbarDriversButton', - glyph: 'xf2c2@FontAwesome', + glyph: 'xf084@FontAwesome', tooltip: Strings.sharedDrivers, tooltipType: 'title' }, { diff --git a/web/app/view/edit/Users.js b/web/app/view/edit/Users.js index e2dd9aa6..2bcaefad 100644 --- a/web/app/view/edit/Users.js +++ b/web/app/view/edit/Users.js @@ -84,7 +84,7 @@ Ext.define('Traccar.view.edit.Users', { disabled: true, handler: 'onDriversClick', reference: 'userDriversButton', - glyph: 'xf2c2@FontAwesome', + glyph: 'xf084@FontAwesome', tooltip: Strings.sharedDrivers, tooltipType: 'title' }, { diff --git a/web/load.js b/web/load.js index 2eef6b6d..0418a131 100644 --- a/web/load.js +++ b/web/load.js @@ -162,8 +162,6 @@ addStyleFile('//cdnjs.cloudflare.com/ajax/libs/extjs/' + extjsVersion + '/packages/charts/classic/triton/resources/charts-all.css'); - addStyleFile('//use.fontawesome.com/releases/v' + fontAwesomeVersion + '/css/all.css'); - addStyleFile('//cdnjs.cloudflare.com/ajax/libs/ol3/' + olVersion + '/ol.css'); if (debugMode) { addScriptFile('//cdnjs.cloudflare.com/ajax/libs/ol3/' + olVersion + '/ol-debug.js'); -- cgit v1.2.3