Skip to content

Commit

Permalink
fix(TotalLayout): Container width
Browse files Browse the repository at this point in the history
feat(HeaderDropdown): Refactor in order to use Mantine Popover and Portals
  • Loading branch information
johan-fx committed Jan 11, 2024
1 parent 7560381 commit 56d8218
Show file tree
Hide file tree
Showing 7 changed files with 249 additions and 263 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ const TotalLayoutContainer = ({ Header, Footer, scrollRef, children }) => {
}, [scrollRef?.current, handleScroll]);

return (
<Box id="TotalLayout" className={classes.root}>
<Box className={classes.root}>
<Stack fullWidth fullHeight direction="column">
<Box className={classes.header} noFlex>
{isFunction(Header) ? <Header /> : Header}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ const TotalLayoutContainerStyles = createStyles((theme, { topScroll }) => ({
root: {
height: '100vh',
backgroundColor: theme.other.core.color.neutral['50'],
width: '100%',
},
header: {
boxShadow: topScroll && '0 8px 24px rgba(149, 157, 165, 0.2)',
Expand Down
39 changes: 8 additions & 31 deletions packages/components/src/misc/Logo/Logo.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 8 additions & 10 deletions packages/components/src/misc/Logo/Logo.styles.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
import { createStyles } from '@mantine/styles';

export const LogoStyles = createStyles((theme, {}, getRef) => {
return {
positive: {
color: theme.colors.text01,
},
negative: {
color: theme.colors.text07,
},
};
});
export const LogoStyles = createStyles((theme, {}, getRef) => ({
positive: {
color: '#0D2023',
},
negative: {
color: 'white',
},
}));
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ export const HEADER_DROPDOWN_DEFAULT_PROPS = {
data: [],
placeholder: '',
readOnly: false,
withSearchInput: false,
};
export const HEADER_DROPDOWN_PROP_TYPES = {
data: PropTypes.arrayOf(PropTypes.object),
Expand All @@ -13,4 +14,5 @@ export const HEADER_DROPDOWN_PROP_TYPES = {
value: PropTypes.shape({ id: PropTypes.string }),
readOnly: PropTypes.bool,
onChange: PropTypes.func,
withSearchInput: PropTypes.bool,
};
Loading

0 comments on commit 56d8218

Please sign in to comment.