diff --git a/frontend/src/components/details/DetailsComponent.js b/frontend/src/components/details/DetailsComponent.js index 4e4e33f9..dc2f5fce 100644 --- a/frontend/src/components/details/DetailsComponent.js +++ b/frontend/src/components/details/DetailsComponent.js @@ -3,6 +3,7 @@ import ScenarioComponent from './ScenarioComponent'; import { jsPDF } from 'jspdf'; import html2canvas from 'html2canvas'; import { Col, Container, Row } from 'react-grid-system'; +import './navbar.css'; // import { postCalculationRequest } from 'interface/BackendConnect'; /** diff --git a/frontend/src/components/details/navbar.css b/frontend/src/components/details/navbar.css index 4f03e2ae..38f2aa55 100644 --- a/frontend/src/components/details/navbar.css +++ b/frontend/src/components/details/navbar.css @@ -1,5 +1,3 @@ -@import url('theme.css'); - /* Style the navigation menu */ .navbar { width: 100%; diff --git a/frontend/src/components/header/HeaderComponent.js b/frontend/src/components/header/HeaderComponent.js index 011f40e3..bbb20f3f 100644 --- a/frontend/src/components/header/HeaderComponent.js +++ b/frontend/src/components/header/HeaderComponent.js @@ -1,13 +1,12 @@ import React, { useContext } from 'react'; import { string } from 'prop-types'; import { Row } from 'simple-flexbox'; -import { useTheme } from 'react-jss'; import { SidebarContext } from 'hooks/useSidebar'; import SLUGS from 'resources/slugs'; import { PrivateSectionContext } from 'hooks/PrivateSectionContext'; import slugs from 'resources/slugs'; import { Link } from 'react-router-dom'; -import { createUseStyles } from 'react-jss'; +import { createUseStyles, useTheme } from 'react-jss'; /** * The Header Component is a shared component between all pages. It displays @@ -29,6 +28,7 @@ function HeaderComponent() { const { currentItem } = useContext(SidebarContext); // get the current Path selected in the Sidebar const [selectedProducts] = useContext(PrivateSectionContext); const theme = useTheme(); + //eslint-disable-next-line const classes = useStyles({ theme }); let title; diff --git a/frontend/src/components/header/header.css b/frontend/src/components/header/header.css index 0063268f..b4a9ba23 100644 --- a/frontend/src/components/header/header.css +++ b/frontend/src/components/header/header.css @@ -1,10 +1,11 @@ @import url('theme.css'); - /* Reconfiguration of the header bar */ .HeaderContainer { - height: 70; + height: 85; width: 100%; - color: #000000; + /* background-color: #4D217A; */ + background: var(--global--headerbar--color); + } /* Reconfiguration of the title style on the header bar */ .HeaderTitle { @@ -15,25 +16,26 @@ line-height: 16px; letter-spacing: 0.5px; margin-left: 30px; - color: #00b300; + color: var( --global--header--title--color); } /* Reconfiguration of the icon style on the header bar */ .HeaderIconSyle { font-size: var(--global--header-icon-title--FontSize); - color: var(--global--header--color); + color: var(--global--header--icon--color); padding-right: 100; margin-right: 10px; margin-top: 10px; margin-bottom: 10px; } + /* Reconfiguration of the back icon style on the header bar */ .HeaderBackIconSyle { float: left; padding: 12px; - background-color: #468c46; /* #466e78;*/ + background-color: #468c46 ;/* #466e78;*/ text-decoration: none; - font-size: var(--global--header-back-icon-title--FontSize); + font-size: var( --global--header-back-icon-title--FontSize); width: 20%; /* Four equal-width links. If you have two links, use 50%, and 33.33% for three links, etc.. */ text-align: right; /* If you want the text to be centered */ border-style: none; @@ -48,7 +50,7 @@ margin-left: 40; letter-spacing: 0.5px; line-height: 16px; - color: #00b300; + color: var(--global--header--icon--color); margin-bottom: 15px; margin-top: 5px; -} +} \ No newline at end of file diff --git a/frontend/src/components/sidebar/MenuItemComponent.js b/frontend/src/components/sidebar/MenuItemComponent.js index dacc096c..e638d4bf 100644 --- a/frontend/src/components/sidebar/MenuItemComponent.js +++ b/frontend/src/components/sidebar/MenuItemComponent.js @@ -66,12 +66,13 @@ function MenuItemComponent({ children, icon: Icon, id, items = [], level = 1, on return ( -
-