From 3415e74c889aedea2c3bb6c3939ae1aec1b0b668 Mon Sep 17 00:00:00 2001 From: joseCorte-exe Date: Fri, 1 Jul 2022 15:22:42 -0300 Subject: [PATCH 1/2] changing button telemetry color --- .../buttons/gradientButton/GradientButtonView.ts | 2 +- src/components/graph/Chart.tsx | 10 +++++----- src/components/graph/Chart2.tsx | 2 +- src/styles/layouts/Telemetria/TelemetriaView.ts | 5 ----- 4 files changed, 7 insertions(+), 12 deletions(-) diff --git a/src/components/buttons/gradientButton/GradientButtonView.ts b/src/components/buttons/gradientButton/GradientButtonView.ts index 5cf53c6..ee5e7cc 100644 --- a/src/components/buttons/gradientButton/GradientButtonView.ts +++ b/src/components/buttons/gradientButton/GradientButtonView.ts @@ -20,7 +20,7 @@ export const GradientButtonView = styled.button` color: #FFFFFF; background: ${ props => props.color==='orange'? - 'linear-gradient(200.86deg, #e7992f 8.03%, #e7992f 91.97%), #FFFFFF' + 'linear-gradient(200.86deg, #ff7f59 8.03%, #df4b1f 91.97%),#FFFFFF' : props.color === 'purple'? 'linear-gradient(200.69deg, #254f7f 9%, #254f7f 98%), #FFFFFF' diff --git a/src/components/graph/Chart.tsx b/src/components/graph/Chart.tsx index 6cb8590..6508666 100644 --- a/src/components/graph/Chart.tsx +++ b/src/components/graph/Chart.tsx @@ -47,11 +47,11 @@ export default function Chart({ title, data1, data2, label, subtitle, dataset1, const options: any = { responsive: true, scales: { - yAxes: [{ - gridLines: { - color: "rgba(0, 0, 0, 0)", - } - }] + x: { + grid: { + display: false + } + }, }, plugins: { datalabels: { diff --git a/src/components/graph/Chart2.tsx b/src/components/graph/Chart2.tsx index c190a16..908fc8b 100644 --- a/src/components/graph/Chart2.tsx +++ b/src/components/graph/Chart2.tsx @@ -93,7 +93,7 @@ export default function Chart({ title, data1, data2, label, subtitle, dataset1, label: dataset1? dataset1 : '2021', data: data1.map(value => value.economia_acumulada? value.economia_acumulada : 0), backgroundColor: (value, ctx) => { - return data2[value.dataIndex]?.dad_estimado == false ? '#255488' : draw('diagonal-right-left', '#C2d5fb'); + return data1[value.dataIndex]?.dad_estimado == false ? '#255488' : draw('diagonal-right-left', '#C2d5fb'); }, }, { diff --git a/src/styles/layouts/Telemetria/TelemetriaView.ts b/src/styles/layouts/Telemetria/TelemetriaView.ts index 185258e..d80f87b 100644 --- a/src/styles/layouts/Telemetria/TelemetriaView.ts +++ b/src/styles/layouts/Telemetria/TelemetriaView.ts @@ -255,11 +255,6 @@ export const Buttons = styled.div` color: #FFFFFF; - :nth-child(2) { - font-size: 11px; - background: linear-gradient(200.86deg, #F48665 8.03%, #F48665 91.97%), #FFFFFF; - } - box-shadow: 0.5px 3px 10px rgba(119, 119, 119, 0.1); border-style: none; From 813645e7834bdca74467ade1a463bec56ede062f Mon Sep 17 00:00:00 2001 From: joseCorte-exe Date: Fri, 1 Jul 2022 15:27:05 -0300 Subject: [PATCH 2/2] changing button telemetry color --- src/pages/telemetria/index.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/telemetria/index.tsx b/src/pages/telemetria/index.tsx index d05ed17..514c138 100644 --- a/src/pages/telemetria/index.tsx +++ b/src/pages/telemetria/index.tsx @@ -349,7 +349,7 @@ export default function Telemetria({userName, clients}: any) { setShowChart(!showChart)} purple /> handleVerifyFields()} orange /> - { + { const html = document.querySelector("table").outerHTML; htmlToCSV(html, "telemetria.csv"); }}/>