From df0d62f6ed221a3e15294781fa654f0e1f2362e0 Mon Sep 17 00:00:00 2001 From: Pete Harverson Date: Thu, 8 Nov 2018 21:13:59 +0000 Subject: [PATCH] [ML] Updates job type and APM module icon to new designs (#25380) * [ML] Updates job type and APM module icon to new designs * [ML] Use self closing tags for icons * [ML] Removes unnecessary icon from jobs list --- .../ml/public/assets/ml_create_advanced_job.svg | 12 ------------ .../ml/public/assets/ml_create_multi_metric_job.svg | 10 ---------- .../ml/public/assets/ml_create_population_job.svg | 11 ----------- .../ml/public/assets/ml_create_single_metric_job.svg | 3 --- .../plugins/ml/public/assets/ml_data_visualizer.svg | 8 -------- .../datavisualizer/datavisualizer_sidebar.html | 2 +- .../components/job_filter_bar/job_filter_bar.js | 1 - .../jobs/new_job/wizard/steps/job_type/job_type.html | 10 +++++----- .../wizard/steps/job_type/job_type_controller.js | 2 -- .../modules/apm_transaction/logo.json | 6 +++--- 10 files changed, 9 insertions(+), 56 deletions(-) delete mode 100644 x-pack/plugins/ml/public/assets/ml_create_advanced_job.svg delete mode 100644 x-pack/plugins/ml/public/assets/ml_create_multi_metric_job.svg delete mode 100644 x-pack/plugins/ml/public/assets/ml_create_population_job.svg delete mode 100644 x-pack/plugins/ml/public/assets/ml_create_single_metric_job.svg delete mode 100644 x-pack/plugins/ml/public/assets/ml_data_visualizer.svg diff --git a/x-pack/plugins/ml/public/assets/ml_create_advanced_job.svg b/x-pack/plugins/ml/public/assets/ml_create_advanced_job.svg deleted file mode 100644 index c29639b0b16c..000000000000 --- a/x-pack/plugins/ml/public/assets/ml_create_advanced_job.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/x-pack/plugins/ml/public/assets/ml_create_multi_metric_job.svg b/x-pack/plugins/ml/public/assets/ml_create_multi_metric_job.svg deleted file mode 100644 index 6f7f35be34e1..000000000000 --- a/x-pack/plugins/ml/public/assets/ml_create_multi_metric_job.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/x-pack/plugins/ml/public/assets/ml_create_population_job.svg b/x-pack/plugins/ml/public/assets/ml_create_population_job.svg deleted file mode 100644 index 300e473045f1..000000000000 --- a/x-pack/plugins/ml/public/assets/ml_create_population_job.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/x-pack/plugins/ml/public/assets/ml_create_single_metric_job.svg b/x-pack/plugins/ml/public/assets/ml_create_single_metric_job.svg deleted file mode 100644 index 398ee246aeb0..000000000000 --- a/x-pack/plugins/ml/public/assets/ml_create_single_metric_job.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/x-pack/plugins/ml/public/assets/ml_data_visualizer.svg b/x-pack/plugins/ml/public/assets/ml_data_visualizer.svg deleted file mode 100644 index 092444438ffe..000000000000 --- a/x-pack/plugins/ml/public/assets/ml_data_visualizer.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/x-pack/plugins/ml/public/datavisualizer/datavisualizer_sidebar.html b/x-pack/plugins/ml/public/datavisualizer/datavisualizer_sidebar.html index b149bed1a32d..2f700e7a1c47 100644 --- a/x-pack/plugins/ml/public/datavisualizer/datavisualizer_sidebar.html +++ b/x-pack/plugins/ml/public/datavisualizer/datavisualizer_sidebar.html @@ -21,7 +21,7 @@
- Advanced job +

Advanced

diff --git a/x-pack/plugins/ml/public/jobs/jobs_list/components/job_filter_bar/job_filter_bar.js b/x-pack/plugins/ml/public/jobs/jobs_list/components/job_filter_bar/job_filter_bar.js index 20ef9b3b6b34..e2624df92b36 100644 --- a/x-pack/plugins/ml/public/jobs/jobs_list/components/job_filter_bar/job_filter_bar.js +++ b/x-pack/plugins/ml/public/jobs/jobs_list/components/job_filter_bar/job_filter_bar.js @@ -70,7 +70,6 @@ export class JobFilterBar extends Component { return ( diff --git a/x-pack/plugins/ml/public/jobs/new_job/wizard/steps/job_type/job_type.html b/x-pack/plugins/ml/public/jobs/new_job/wizard/steps/job_type/job_type.html index 180d3f9adbaa..a5271376e142 100644 --- a/x-pack/plugins/ml/public/jobs/new_job/wizard/steps/job_type/job_type.html +++ b/x-pack/plugins/ml/public/jobs/new_job/wizard/steps/job_type/job_type.html @@ -64,7 +64,7 @@
- Single metric job +

Single metric

@@ -85,7 +85,7 @@
- Multi metric job +

Multi metric

@@ -106,7 +106,7 @@
- Population job +

Population

@@ -127,7 +127,7 @@
- Advanced job +

Advanced

@@ -165,7 +165,7 @@
- Single metric job +

Data Visualizer

diff --git a/x-pack/plugins/ml/public/jobs/new_job/wizard/steps/job_type/job_type_controller.js b/x-pack/plugins/ml/public/jobs/new_job/wizard/steps/job_type/job_type_controller.js index d7edf64d0f6a..7cf771bbaded 100644 --- a/x-pack/plugins/ml/public/jobs/new_job/wizard/steps/job_type/job_type_controller.js +++ b/x-pack/plugins/ml/public/jobs/new_job/wizard/steps/job_type/job_type_controller.js @@ -11,7 +11,6 @@ * the user to select the type of job they wish to create. */ -import chrome from 'ui/chrome'; import uiRoutes from 'ui/routes'; import { checkLicenseExpired } from 'plugins/ml/license/check_license'; import { checkCreateJobsPrivilege } from 'plugins/ml/privilege/check_privilege'; @@ -79,5 +78,4 @@ module.controller('MlNewJobStepJobType', addItemToRecentlyAccessed('jobs/new_job/datavisualizer', title, url); }; - $scope.assetsPath = `${chrome.getBasePath()}/plugins/ml/assets`; }); diff --git a/x-pack/plugins/ml/server/models/data_recognizer/modules/apm_transaction/logo.json b/x-pack/plugins/ml/server/models/data_recognizer/modules/apm_transaction/logo.json index 88cff79a5b58..804f35285137 100644 --- a/x-pack/plugins/ml/server/models/data_recognizer/modules/apm_transaction/logo.json +++ b/x-pack/plugins/ml/server/models/data_recognizer/modules/apm_transaction/logo.json @@ -1,5 +1,5 @@ { - "src": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAlCAYAAAAjt+tHAAADMUlEQVRYhe2XTWhUVxSAv/Nm3jSVRB3SJtCMZhhpky4LguCiug2FbnRRBFeKGxFEEBSXCl2VLMSdhS7qJuhCC9JVIQUXrloItLbUxPyaxJ9kUIOTO/NOF/fe9zMThHQGp4vczZt77rnvfPeen3dGVFXp4gi6afx/AZAHuLn4hDurixTzhS2VIrKka/VNjg0McXqo3D7At9OPuDL/D6EKRsSZA1VBJAkPu57Mf6mu86xW43JlpC0A2T15X19pI2VE3FIUGw1V4g2bfqMoRXK8ODLWFkBwIXWNRhRVJXSJYecSGzWiFABxkOdLZdodoqp6fe4xt1cXKeZDVEHEO8JRuqePhWrdcHywxNl9lc4AtP2WNkbX07DrAPlmwWsTcW/2DYJgfaOAuCeA4BPFOk8REbwjRcB6NdHzul8P76I3zJ45EwN/Vw0nJleZ36jTUCUnYNxaoGTmIeJ07DOSRMeDAhiUELvvwId5bh0d4LM9ScHL4Hw3tcb0holf7F8SpnQCTYy7sxGJlUViDRtnuKFKoNBwe2Y26oxPVTM3kAEY7rOmcoIzYI00lAyQ1ZEmmTemMWTkliKxQDkR9vdmvd6ShhcePueHmdfxyY07dZTyp5+nb8Y0yf085wKhocrJSi/jhz56NwDAWi0iEUscgzbA0oGWVEWwsvQ8lrt7Kn7QmnQ7hailDgC8MJsE2Nqf+gKjYolV7W9xz/5w6z7iPwGc+/N3bqwuZGTNvQExnh0jhR6+//wLDu/t3zZAJgauTT/i6txjgLgP8E1Ic29gJBs6oQi1L7/aNkAmBp683QBs0xG6PkBTBtVBpKFwOkaVpc237QFcHP6UkUIPItaQiL16D5G4IYihvHy8PMonhZ5tA7Sk4atGnbsrS2Ra0eZIhGRdlNFduzm4p7ht41sCvO/R9TrQdYAtC1E7Y2J5kR+XZxGfIdLa1K4bw7HBEuf2VzoLMLEyzzd/TbmPUrZwhZqkr6rw68wfvDS1zgbh2G8P+Lm6Hhv3tcSncoFsgeuTXGdj4MxQGWmqln4uqdP7calU6Xwa/vRsiVtPFwhSfYH3faQQiP1ze/zjIU6Vyjt1YAeAfwEhypX7ku7g2QAAAABJRU5ErkJggg==", - "height": 25, - "width": 120 + "src": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgAgMAAAAOFJJnAAAADFBMVEUAAAAAAAABf3X////ZaOWRAAAAAXRSTlMAQObYZgAAAAFiS0dEAxEMTPIAAAAkSURBVBjTY2DADVaBATKDTBAKBsgMss0JQWWQDZhgHmLC7zMAVdUSm3304YkAAAAASUVORK5CYII=", + "height": 32, + "width": 32 }