Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

pull latest change #1236

Merged
merged 5 commits into from
Dec 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions src/components/NavBar/NavBarThemeConfig.jsx
Original file line number Diff line number Diff line change
@@ -1,21 +1,22 @@
import React from "react";
import { MuiThemeProvider, createTheme } from "@material-ui/core/styles";
import themes, { overrides } from "../../themes";
import React from 'react';
import { MuiThemeProvider, createTheme } from '@material-ui/core/styles';
import themes, { overrides } from '../../themes';

const NavBarThemeProvider = ({ children }) => {
const style = [];
const overridesObj = themes.light.overrides;
const MuiButton = {
root: {
"&#button_navbar_mycases": {
marginRight: "-16px",
'&#button_navbar_mycases': {
marginRight: '-16px',
},
},
};

const MuiAppBar = {
positionFixed: {
position: "relative",
position: 'relative',
zIndex: 10,
},
};

Expand Down
18 changes: 12 additions & 6 deletions src/components/NavBar/NavBarView.jsx
Original file line number Diff line number Diff line change
@@ -1,18 +1,24 @@
import React from "react";
import { NavBar } from "@bento-core/nav-bar";
import React from 'react';
import { NavBar } from '@bento-core/nav-bar';
import {
navBarData,
navBarCartData,
navBarstyling,
externalLinks,
} from "../../bento/navigationBarData";
} from '../../bento/navigationBarData';

import NavBarThemeProvider from "./NavBarThemeConfig";
import NavBarThemeProvider from './NavBarThemeConfig';
import styled from '@emotion/styled';

const NavContrainer = styled('div')({
position: 'relative',
zIndex: 0,
});

const BentoNavBar = ({ cartFieldIds = [] }) => (
<>
<NavBarThemeProvider>
<div style={{ position: "relative" }}>
<NavContrainer>
<NavBar
navBarData={navBarData}
navBarCartData={navBarCartData}
Expand All @@ -22,7 +28,7 @@ const BentoNavBar = ({ cartFieldIds = [] }) => (
externalLinks={externalLinks}
externalLinksFirst
/>
</div>
</NavContrainer>
</NavBarThemeProvider>
</>
);
Expand Down
88 changes: 0 additions & 88 deletions src/components/header/HeaderStyles.js

This file was deleted.

135 changes: 135 additions & 0 deletions src/components/header/HeaderTheme.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,135 @@
import React from 'react';
import { MuiThemeProvider, createTheme } from '@material-ui/core/styles';
import vectorIcon from '../../assets/header/Vector.svg';
import searchIcon from '../../assets/header/global_search_input_find.svg';

const HeaderThemeProvider = ({ children }) => {
const computedTheme = createTheme({
overrides: {
MuiGrid: {
container: {
'& div#header': {
zIndex: 0,
},
},
},
MuiTextField: {
root: {
margin: '0 auto',
paddingTop: '25px',
width: '260px',
height: '37px',
},
},
MuiInputLabel: {
root: {
width: '0%',
opacity: '0',
},
},
MuiSvgIcon: {
root: {
color: '#25557E',
stroke: '#4A8ECB',
strokeWidth: '1.1px',
marginRight: '8px',
cursor: 'pointer',
backgroundRepeat: 'no-repeat',
marginTop: '5px',
backgroundImage: `url(${searchIcon})`,
'& path': {
display: 'none',
},
},
},
MuiInputBase: {
root: {
fontFamily: 'Open Sans',
fontSize: '13.5px',
color: '#25557E',
fontWeight: 400,
padding: '0px',
fontStyle: '1rem',
lineHeight: '16px',
texttransform: 'uppercase',
},
input: {
fontSize: '1rem',
},
},
MuiOutlinedInput: {
root: {
border: '#4A8ECB solid 1px',
borderRadius: '8px',
},

notchedOutline: {
border: 'none',
},
inputAdornedEnd: {
padding: '0 8px !important',
},
},
MuiAutocomplete: {
inputRoot: {
'&[class*="MuiOutlinedInput-root"]': {
padding: '2px',
},
},
paper: {
borderRadius: '8px',
},
option: {
'&:hover': {
color: '#FFF',
backgroundColor: '#1C75BC',
},
},
listbox: {
borderRadius: '8px',
fontFamily: 'Open Sans',
fontSize: '13.5px',
color: '#0B3556',
fontWeight: 400,
border: '1px solid #4A8ECB',
padding: '0px',
fontStyle: 'normal',
lineHeight: '26px',
texttransform: 'uppercase',
'& li': {
// list item specific styling
padding: '3px, 14px, 4px, 14px',
borderBottom: '1px solid #4A8ECB',
'&:nth-last-child(1)': {
borderBottom: 'none',
fontSize: '16px',
color: '#000000',
backgroundColor: '#E9E9E9',
'& :hover': {
color: '#000000',
backgroundColor: '#E9E9E9',
pointerEvents: 'none',
},
'& span': {
backgroundImage: `url(${vectorIcon})`,
width: '165px',
marginTop: '5px',
float: 'right',
height: '15px',
display: 'block',
backgroundRepeat: 'no-repeat',
'& img': {
display: 'none',
},
},
},
},
},
},
},
});

return <MuiThemeProvider theme={computedTheme}>{children}</MuiThemeProvider>;
};

export default HeaderThemeProvider;
Loading
Loading