From 06640aceb64564adb8985b50c5604aeb0a77e7ad Mon Sep 17 00:00:00 2001 From: Alex Santos Date: Wed, 11 May 2022 12:49:21 -0300 Subject: [PATCH] Telemetry finished --- pages/telemetria.tsx | 20 ++++++++++--------- src/components/banner/BannerView.ts | 11 ++++++---- .../buttons/basicButton/BasicButtonView.ts | 2 +- .../gradientButton/GradientButtonView.ts | 9 ++++++--- styles/layouts/Telemetria/TelemetriaView.ts | 17 ++++++++-------- 5 files changed, 34 insertions(+), 25 deletions(-) diff --git a/pages/telemetria.tsx b/pages/telemetria.tsx index e1a5801..e1c3a20 100644 --- a/pages/telemetria.tsx +++ b/pages/telemetria.tsx @@ -1,6 +1,8 @@ import React from 'react'; import Banner from '../src/components/banner/Banner'; - import { TelemetriaView, Buttons} from '../styles/layouts/Telemetria/TelemetriaView'; +import { TelemetriaView, Buttons} from '../styles/layouts/Telemetria/TelemetriaView'; +import GradientButton from '../src/components/buttons/gradientButton/GradientButton' +import Header from '../src/components/header/Header'; import MenuItem from '@mui/material/MenuItem'; import FormControl from '@mui/material/FormControl'; import Select, { SelectChangeEvent } from '@mui/material/Select'; @@ -21,14 +23,14 @@ export default function Telemetria() { return( - +
- +

Unidade

 - +

Data Final

- - - + + + ) diff --git a/src/components/banner/BannerView.ts b/src/components/banner/BannerView.ts index 6054c72..1d29a5b 100644 --- a/src/components/banner/BannerView.ts +++ b/src/components/banner/BannerView.ts @@ -18,13 +18,16 @@ export const BannerView = styled.div` .text { position: relative; - margin: 82px 0 0 20px; - + margin: 90px 30px; font-family: 'Poppins'; + font-size:19px; font-style: normal; - color: white; - + padding-top:45px; z-index: 2; } + + + + ` diff --git a/src/components/buttons/basicButton/BasicButtonView.ts b/src/components/buttons/basicButton/BasicButtonView.ts index 5c66b88..3080adb 100644 --- a/src/components/buttons/basicButton/BasicButtonView.ts +++ b/src/components/buttons/basicButton/BasicButtonView.ts @@ -7,7 +7,7 @@ export const BasicButtonView = styled.button` width: 120px; height: 45px; - + cursor: pointer; background: #254F7F; border-radius: 8px; border-style: none; diff --git a/src/components/buttons/gradientButton/GradientButtonView.ts b/src/components/buttons/gradientButton/GradientButtonView.ts index 3f1f8fb..54359f8 100644 --- a/src/components/buttons/gradientButton/GradientButtonView.ts +++ b/src/components/buttons/gradientButton/GradientButtonView.ts @@ -6,16 +6,19 @@ export const GradientButtonView = styled.button` align-items: center; flex-direction: column; + border-radius: 2px; - width: 30%; - height: 150px; + width: 25%; + height: 110px; + margin-bottom: 25px; font-family: 'Poppins'; + font-size: 10px; color: #FFFFFF; background: ${ props => props.color==='orange'? - 'linear-gradient(200.86deg, #F48665 8.03%, #F48665 91.97%, #FDA23F 91.97%), #FFFFFF' + 'linear-gradient(200.86deg, #F48665 8.03%, #F48665 91.97%), #FFFFFF' : props.color === 'purple'? 'linear-gradient(200.69deg, #9A56FF 8.53%, #D78AFD 91.47%), #FFFFFF' diff --git a/styles/layouts/Telemetria/TelemetriaView.ts b/styles/layouts/Telemetria/TelemetriaView.ts index adbc46d..f0ea609 100644 --- a/styles/layouts/Telemetria/TelemetriaView.ts +++ b/styles/layouts/Telemetria/TelemetriaView.ts @@ -37,10 +37,11 @@ export const Buttons = styled.div` min-width: 10rem; cursor: pointer; margin-top: 5rem; + padding: 1px 60px; justify-content: space-around; flex-direction: row; height: 6rem; - /* flex-direction: column; */ + /* .btnSucess{ font-size: 10px; @@ -49,7 +50,7 @@ export const Buttons = styled.div` border: none; } */ - .btnGrafico { + /* .btnGrafico { box-shadow:inset 0px 34px 0px -15px #F48665; background-color:#F48665; border:none; @@ -110,7 +111,7 @@ p{ .myButton:active { position:relative; /* justify-content: space-between; */ - top:1px; + /* top:1px; } @@ -119,8 +120,8 @@ p{ box-shadow:inset 100% #23BDB8; background-color:#23BDB8; border:none; - border-radius: 2px; - display:inline-block; + border-radius: 2px; */ + /* display:inline-block; width: 17rem; cursor:pointer; color:#ffffff; @@ -140,9 +141,9 @@ p{ } .myButton:active { position:relative; - /* justify-content: space-between; */ - top:1px; -} + justify-content: space-between; + top:1px; + } */ `;