diff --git a/src/components/content/ContentBlock.js b/src/components/content/ContentBlock.js index 40b1cfd..2945616 100644 --- a/src/components/content/ContentBlock.js +++ b/src/components/content/ContentBlock.js @@ -10,10 +10,9 @@ const useStyles = props => makeStyles(theme => ({ width: "100%", paddingTop: theme.spacing(2), paddingBottom: theme.spacing(2), - backgroundColor: get(theme.palette, props.color), }, title: { - paddingBottom: theme.spacing(2) + paddingBottom: theme.spacing(1) } })); @@ -21,7 +20,7 @@ export function ContentBlock({ children, ...props }) { const classes = useStyles(props)(); return ( - {props.title} + {props.title ? {props.title} : null} {children} ); diff --git a/src/components/layout/PageContainer.js b/src/components/layout/PageContainer.js index 78e978b..9797056 100644 --- a/src/components/layout/PageContainer.js +++ b/src/components/layout/PageContainer.js @@ -8,11 +8,11 @@ const useStyles = props => makeStyles( theme => ({ } })); -export function PageContainer({ children, ...props }){ +export function PageContainer({ children, style, ...props }){ const classes = useStyles(props)(); const classNames = `${classes.root} ${props.className}`; return ( - + {children} ); diff --git a/src/components/layout/Surface.js b/src/components/layout/Surface.js index 87c01be..d96d2a4 100644 --- a/src/components/layout/Surface.js +++ b/src/components/layout/Surface.js @@ -11,11 +11,11 @@ const useStyles = props => makeStyles( theme => ({ } })); -export function Surface({ children, ...props }){ +export function Surface({ children, style, ...props }){ const classes = useStyles(props)(); const classNames = `${classes.root} ${props.className}`; return ( - + {children} ); diff --git a/src/components/navigation/TestTopNavBar.js b/src/components/navigation/TestTopNavBar.js index b4c0792..463d425 100644 --- a/src/components/navigation/TestTopNavBar.js +++ b/src/components/navigation/TestTopNavBar.js @@ -70,20 +70,24 @@ export function TestTopNavBar({ children, ...props }){ - -
- -
- -
-
{children}
-
{props.setCollapsed(true)}}>
-
-
-
-
-
-
+ { + children ? + +
+ +
+ +
+
{children}
+
{props.setCollapsed(true)}}>
+
+
+
+
+
+
+ : null + } ); diff --git a/src/components/userInput/TestInputTextSection.js b/src/components/userInput/TestInputTextSection.js index 8281dc2..d5f9b15 100644 --- a/src/components/userInput/TestInputTextSection.js +++ b/src/components/userInput/TestInputTextSection.js @@ -13,7 +13,7 @@ export function TestInputTextSection({ children, ...props }) { const theme = useTheme(); return ( - + {props.testInputsList.map((elem) => { return ( diff --git a/src/stories/content/ContentBlock.stories.js b/src/stories/content/ContentBlock.stories.js index 4c8283a..d9863a8 100644 --- a/src/stories/content/ContentBlock.stories.js +++ b/src/stories/content/ContentBlock.stories.js @@ -8,5 +8,7 @@ export default { component: ContentBlock }; -export const Default = () => This is content info block's children; +export const Default = () => This is content block's children; + +export const NoTitle = () => This is content block's children. No title here;