Merge branch 'dev-#106' of https://github.com/amosproj/amos-ss2021-ca…

…rbon-footprint into dev-#106
amosproj · Jun 11, 2021 · bba51e1 · bba51e1
2 parents c7d3b88 + 27714d5
commit bba51e1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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: [
-            '#e2d000',
+            '#F6E600',
             theme.color.Steel,
             theme.color.Pressboard,
             theme.color.StainlessSteel,
             theme.color.Alminium,
             '#0084E1',
-            theme.color.Copper
+            '#f28e30'
         ],
         responsive: [
             {

diff --git a/frontend/src/components/details/TableComponent.jsx b/frontend/src/components/details/TableComponent.jsx
@@ -86,7 +86,7 @@ class TableComponent extends Component {
 
                 <table className='w3-table-all w3-card-4 w3-small w3-center'>
                     <thead>
-                        <tr key={'FirstRow'} style={{ backgroundColor: '#11c26b' }}>
+                        <tr key={'FirstRow'} style={{ backgroundColor: '#009B55' }}>
                             {this.state.headers.map((item) => (
                                 <th key={idKey + 'thead' + item.key}>{item.value}</th>
                             ))}