From 094e4775757c1fd5e37c1566bea9cafa630558ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Casper=20Hu=CC=88bertz?= Date: Wed, 12 Jun 2019 22:32:25 +0200 Subject: [PATCH 1/4] Removed hard-coded background color --- .../apm/public/components/shared/charts/Timeline/TimelineAxis.js | 1 - 1 file changed, 1 deletion(-) diff --git a/x-pack/plugins/apm/public/components/shared/charts/Timeline/TimelineAxis.js b/x-pack/plugins/apm/public/components/shared/charts/Timeline/TimelineAxis.js index 10e523c387278..f59d2f5e84d79 100644 --- a/x-pack/plugins/apm/public/components/shared/charts/Timeline/TimelineAxis.js +++ b/x-pack/plugins/apm/public/components/shared/charts/Timeline/TimelineAxis.js @@ -43,7 +43,6 @@ function TimelineAxis({ plotValues, agentMarks, traceRootDuration }) {
Date: Wed, 12 Jun 2019 22:32:48 +0200 Subject: [PATCH 2/4] Updated x-axis ticks text color to match other charts --- .../public/components/shared/charts/Timeline/TimelineAxis.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x-pack/plugins/apm/public/components/shared/charts/Timeline/TimelineAxis.js b/x-pack/plugins/apm/public/components/shared/charts/Timeline/TimelineAxis.js index f59d2f5e84d79..722dc85623273 100644 --- a/x-pack/plugins/apm/public/components/shared/charts/Timeline/TimelineAxis.js +++ b/x-pack/plugins/apm/public/components/shared/charts/Timeline/TimelineAxis.js @@ -69,7 +69,7 @@ function TimelineAxis({ plotValues, agentMarks, traceRootDuration }) { tickFormat={tickFormat} tickPadding={20} style={{ - text: { fill: theme.euiColorMediumShade } + text: { fill: theme.euiColorDarkShade } }} /> From 79ba228ba8e4d4f011cf6f510ffdc356577e09b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Casper=20Hu=CC=88bertz?= Date: Wed, 12 Jun 2019 22:33:24 +0200 Subject: [PATCH 3/4] Updated to match Eui border-radius --- x-pack/plugins/apm/public/style/variables.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x-pack/plugins/apm/public/style/variables.ts b/x-pack/plugins/apm/public/style/variables.ts index 60cd8b0460e7d..24ef608441324 100644 --- a/x-pack/plugins/apm/public/style/variables.ts +++ b/x-pack/plugins/apm/public/style/variables.ts @@ -28,7 +28,7 @@ export function pct(value: number): string { } // Styling -export const borderRadius = '5px'; +export const borderRadius = '4px'; // Fonts export const fontFamily = '"Open Sans", Helvetica, Arial, sans-serif'; From 760e38f15de3d4e3cecd838d4a7783b53429d19a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Casper=20Hu=CC=88bertz?= Date: Wed, 12 Jun 2019 22:48:20 +0200 Subject: [PATCH 4/4] Update snapshots --- .../__snapshots__/Stackframe.test.tsx.snap | 14 ++-- .../__snapshots__/CustomPlot.test.js.snap | 4 +- .../__snapshots__/Histogram.test.js.snap | 4 +- .../__snapshots__/Timeline.test.js.snap | 83 +++++++++---------- 4 files changed, 52 insertions(+), 53 deletions(-) diff --git a/x-pack/plugins/apm/public/components/shared/Stacktrace/__test__/__snapshots__/Stackframe.test.tsx.snap b/x-pack/plugins/apm/public/components/shared/Stacktrace/__test__/__snapshots__/Stackframe.test.tsx.snap index 7f00162106454..1b465db1c6263 100644 --- a/x-pack/plugins/apm/public/components/shared/Stacktrace/__test__/__snapshots__/Stackframe.test.tsx.snap +++ b/x-pack/plugins/apm/public/components/shared/Stacktrace/__test__/__snapshots__/Stackframe.test.tsx.snap @@ -15,7 +15,7 @@ exports[`Stackframe when stackframe has source lines should render correctly 1`] .c4 { position: relative; - border-radius: 0 0 5px 5px; + border-radius: 0 0 4px 4px; } .c5 { @@ -31,7 +31,7 @@ exports[`Stackframe when stackframe has source lines should render correctly 1`] position: absolute; top: 0; left: 0; - border-radius: 0 0 0 5px; + border-radius: 0 0 0 4px; background: #f5f7fa; } @@ -47,7 +47,7 @@ exports[`Stackframe when stackframe has source lines should render correctly 1`] } .c7:last-of-type { - border-radius: 0 0 0 5px; + border-radius: 0 0 0 4px; } .c8 { @@ -63,7 +63,7 @@ exports[`Stackframe when stackframe has source lines should render correctly 1`] } .c8:last-of-type { - border-radius: 0 0 0 5px; + border-radius: 0 0 0 4px; } .c9 { @@ -74,7 +74,7 @@ exports[`Stackframe when stackframe has source lines should render correctly 1`] } .c9:last-of-type { - border-radius: 0 0 5px 0; + border-radius: 0 0 4px 0; } .c10 { @@ -98,7 +98,7 @@ exports[`Stackframe when stackframe has source lines should render correctly 1`] .c1 { border-bottom: 1px solid #d3dae6; - border-radius: 5px 5px 0 0; + border-radius: 4px 4px 0 0; } .c0 { @@ -106,7 +106,7 @@ exports[`Stackframe when stackframe has source lines should render correctly 1`] font-family: "SFMono-Regular",Consolas,"Liberation Mono",Menlo,Courier,monospace; font-size: 14px; border: 1px solid #d3dae6; - border-radius: 5px; + border-radius: 4px; background: #f5f7fa; } diff --git a/x-pack/plugins/apm/public/components/shared/charts/CustomPlot/test/__snapshots__/CustomPlot.test.js.snap b/x-pack/plugins/apm/public/components/shared/charts/CustomPlot/test/__snapshots__/CustomPlot.test.js.snap index 119f46f09d1ea..7cc68fefb7cac 100644 --- a/x-pack/plugins/apm/public/components/shared/charts/CustomPlot/test/__snapshots__/CustomPlot.test.js.snap +++ b/x-pack/plugins/apm/public/components/shared/charts/CustomPlot/test/__snapshots__/CustomPlot.test.js.snap @@ -2859,7 +2859,7 @@ Array [ transform: translateY(-50%); border: 1px solid #d3dae6; background: #ffffff; - border-radius: 5px; + border-radius: 4px; font-size: 14px; color: #000000; } @@ -2867,7 +2867,7 @@ Array [ .c1 { background: #f5f7fa; border-bottom: 1px solid #d3dae6; - border-radius: 5px 5px 0 0; + border-radius: 4px 4px 0 0; padding: 8px; color: #98a2b3; } diff --git a/x-pack/plugins/apm/public/components/shared/charts/Histogram/__test__/__snapshots__/Histogram.test.js.snap b/x-pack/plugins/apm/public/components/shared/charts/Histogram/__test__/__snapshots__/Histogram.test.js.snap index 305acafcf5597..dcbaeccf14506 100644 --- a/x-pack/plugins/apm/public/components/shared/charts/Histogram/__test__/__snapshots__/Histogram.test.js.snap +++ b/x-pack/plugins/apm/public/components/shared/charts/Histogram/__test__/__snapshots__/Histogram.test.js.snap @@ -1412,7 +1412,7 @@ exports[`Histogram when hovering over a non-empty bucket should have correct mar transform: translateY(-50%); border: 1px solid #d3dae6; background: #ffffff; - border-radius: 5px; + border-radius: 4px; font-size: 14px; color: #000000; } @@ -1420,7 +1420,7 @@ exports[`Histogram when hovering over a non-empty bucket should have correct mar .c1 { background: #f5f7fa; border-bottom: 1px solid #d3dae6; - border-radius: 5px 5px 0 0; + border-radius: 4px 4px 0 0; padding: 8px; color: #98a2b3; } diff --git a/x-pack/plugins/apm/public/components/shared/charts/Timeline/__test__/__snapshots__/Timeline.test.js.snap b/x-pack/plugins/apm/public/components/shared/charts/Timeline/__test__/__snapshots__/Timeline.test.js.snap index 3d2c94ea89183..f87c799274e8f 100644 --- a/x-pack/plugins/apm/public/components/shared/charts/Timeline/__test__/__snapshots__/Timeline.test.js.snap +++ b/x-pack/plugins/apm/public/components/shared/charts/Timeline/__test__/__snapshots__/Timeline.test.js.snap @@ -48,7 +48,6 @@ exports[`Timeline should render with data 1`] = `