diff --git a/frontend/src/components/cards/MiniCardComponent.js b/frontend/src/components/cards/MiniCardComponent.js index b6f73329..86eab142 100644 --- a/frontend/src/components/cards/MiniCardComponent.js +++ b/frontend/src/components/cards/MiniCardComponent.js @@ -13,7 +13,7 @@ const useStyles = createUseStyles((theme) => ({ // marginTop:50, // padding: '8px 16px 8px 16px', '&:hover': { - borderColor: theme.uniformStyle.color.tableHeaderColor, + borderColor: '#AE56FF', '&:nth-child(n) > span': { color: theme.color.lightBlue } diff --git a/frontend/src/components/details/ColumnChartComponent.jsx b/frontend/src/components/details/ColumnChartComponent.jsx index b7c7e2a1..a96f818f 100644 --- a/frontend/src/components/details/ColumnChartComponent.jsx +++ b/frontend/src/components/details/ColumnChartComponent.jsx @@ -1,6 +1,7 @@ import React from 'react'; import ReactApexChart from 'react-apexcharts'; import { getImpactAssessmentData, getLifeCycleStages } from 'interface/projectInterface'; +import theme from 'resources/theme'; /** * Column Chart @@ -32,7 +33,7 @@ const ColumnChartComponent = () => { } }, fill: { - colors: ['#21C0FF']//['#2cb5de'] + colors: ['#75bab4']//['#2cb5de'] }, dataLabels: { @@ -43,7 +44,7 @@ const ColumnChartComponent = () => { offsetY: -20, style: { fontSize: '12px', - colors: ['#21C0FF'] + colors: ['#a9d1cd'] } }, yaxis: { diff --git a/frontend/src/components/details/PieChartComponent.jsx b/frontend/src/components/details/PieChartComponent.jsx index ed5612f4..cae0053a 100644 --- a/frontend/src/components/details/PieChartComponent.jsx +++ b/frontend/src/components/details/PieChartComponent.jsx @@ -31,13 +31,13 @@ const PieChartComponent = () => { labels: labels, // TODO: do the materials stay the same? otherwise doesn't make sense to use fixed color / hardcode them colors: [ - '#F6E600', - theme.color.Steel, - theme.color.Pressboard, - theme.color.StainlessSteel, + '#F7EA48', + '#CBD2DE', + '#FDB0C0', + '#A4C8D5', theme.color.Alminium, - '#0084E1', - '#f28e30' + '#52bede', + '#D89279' ], responsive: [ { diff --git a/frontend/src/components/details/SelectVariableComponent.jsx b/frontend/src/components/details/SelectVariableComponent.jsx index b0f9b687..b2644354 100644 --- a/frontend/src/components/details/SelectVariableComponent.jsx +++ b/frontend/src/components/details/SelectVariableComponent.jsx @@ -49,22 +49,22 @@ class SelectVariableComponent extends Component {
{item.value} | ))} diff --git a/frontend/src/components/details/charts_tables.css b/frontend/src/components/details/charts_tables.css index f4453228..fe9a8b14 100644 --- a/frontend/src/components/details/charts_tables.css +++ b/frontend/src/components/details/charts_tables.css @@ -9,7 +9,7 @@ font-weight: bold; font-size: var(--global--text-title--FontSize); letter-spacing: 0.5px; - color: #000000; + color: #1B1534; } /* Reconfiguration of the title style on Column chart */ @@ -67,7 +67,7 @@ font-weight: bold; font-size: var(--global--text-title--FontSize); letter-spacing: 0.5px; - color: #000000; + color: #1B1534; margin-bottom: 10px; } /* Reconfiguration of the title style on cards */ @@ -78,7 +78,7 @@ font-size: var(--global--text-title--FontSize); letter-spacing: 0.5px; padding-left: 17px; - color: #000000; + color: #1B1534; padding-bottom: 10px; } @@ -89,7 +89,7 @@ font-weight: normal; font-size: var(--global--text-subtitle--FontSize); letter-spacing: 0.5px; - color: #000000; + color: #1B1534; margin-bottom: 10px; } @@ -100,7 +100,7 @@ font-weight: normal; font-size: var(--global--table-items--FontSize); margin-left: 0; - color: #000000; + color: #1B1534; margin-top: 10px; margin-bottom: 10px; } diff --git a/frontend/src/components/details/navbar.css b/frontend/src/components/details/navbar.css index 96a236c7..2f8a0fdf 100644 --- a/frontend/src/components/details/navbar.css +++ b/frontend/src/components/details/navbar.css @@ -4,15 +4,15 @@ border-radius: 25px; height: 80px; padding-top:5px; - color: #4d217a; + color: #F0F0F0; /* border: 3px solid var(--global--button--color); */ /* background-color: var(--global--panel--color); */ } /* -webkit-radial-gradient( bottom right, #4D217A,#1B1534 ); */ :root{ - --global--button--color:#EDEDED; - --global--button--text--color:#4d217a; + --global--button--color:#4d217a; + --global--button--text--color:#F0F0F0; --global--panel-title--FontSize: 22px; --global--text-subtitle--FontSize: 19px; } diff --git a/frontend/src/components/productGrid/ModelDropdownComponent.js b/frontend/src/components/productGrid/ModelDropdownComponent.js index dcc44519..ca213d1a 100644 --- a/frontend/src/components/productGrid/ModelDropdownComponent.js +++ b/frontend/src/components/productGrid/ModelDropdownComponent.js @@ -38,12 +38,7 @@ const ModelDropdownComponent = (props) => {
---|