From ab4866af9819a1d4e99ff8433476a4e60c4cd8be Mon Sep 17 00:00:00 2001 From: Artem Date: Fri, 21 May 2021 16:13:52 +0300 Subject: [PATCH 1/3] feat: link --- src/components/elements/Link.js | 20 ++++++++++++++++++++ src/stories/elements/Link.stories.js | 12 ++++++++++++ 2 files changed, 32 insertions(+) create mode 100644 src/components/elements/Link.js create mode 100644 src/stories/elements/Link.stories.js diff --git a/src/components/elements/Link.js b/src/components/elements/Link.js new file mode 100644 index 0000000..99e7816 --- /dev/null +++ b/src/components/elements/Link.js @@ -0,0 +1,20 @@ +import React from 'react'; +import { makeStyles } from '@material-ui/core/styles'; +import MuiLink from '@material-ui/core/Link'; + +const useStyles = props => makeStyles( theme => ({ + root: { + } +})); + +export function Link({ children, style, ...props }){ + const classes = useStyles(props)(); + const classNames = `${classes.root} ${props.className}`; + return ( + + {children} + + ); +} + +export default Link; diff --git a/src/stories/elements/Link.stories.js b/src/stories/elements/Link.stories.js new file mode 100644 index 0000000..d8fddbd --- /dev/null +++ b/src/stories/elements/Link.stories.js @@ -0,0 +1,12 @@ +import React from 'react'; + +import Link from '../../components/elements/Link'; +import { Router, Route } from 'react-router-dom'; + +export default { + title: 'Elements/Link', + component: Link +}; + + +export const Default = () => This is a Default Link used to pad all the pages. From bafb8c26503750348a42d9c9ad95e84b4d701949 Mon Sep 17 00:00:00 2001 From: Artem Date: Fri, 21 May 2021 16:41:21 +0300 Subject: [PATCH 2/3] edit: contentinfoblock border radius added --- src/components/content/ContentInfoBlock.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/content/ContentInfoBlock.js b/src/components/content/ContentInfoBlock.js index 872f213..04de35b 100644 --- a/src/components/content/ContentInfoBlock.js +++ b/src/components/content/ContentInfoBlock.js @@ -10,6 +10,7 @@ const useStyles = props => makeStyles(theme => ({ width:"100%", padding: theme.spacing(2), backgroundColor: get(theme.palette, props.color), + borderRadius: theme.shape.borderRadius }, })); From 9f2edfff94ec532ecdc433bb5f59d5d7a4be5a5b Mon Sep 17 00:00:00 2001 From: Artem Date: Fri, 21 May 2021 21:00:42 +0300 Subject: [PATCH 3/3] feat: link --- src/stories/elements/Link.stories.js | 4 ++-- src/themes/PurpleTheme.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/stories/elements/Link.stories.js b/src/stories/elements/Link.stories.js index d8fddbd..d444493 100644 --- a/src/stories/elements/Link.stories.js +++ b/src/stories/elements/Link.stories.js @@ -1,7 +1,7 @@ import React from 'react'; import Link from '../../components/elements/Link'; -import { Router, Route } from 'react-router-dom'; +import { Typography } from '@material-ui/core'; export default { title: 'Elements/Link', @@ -9,4 +9,4 @@ export default { }; -export const Default = () => This is a Default Link used to pad all the pages. +export const Default = () => This is a Default Link for style and external links/new tab. diff --git a/src/themes/PurpleTheme.js b/src/themes/PurpleTheme.js index bd40747..07ce100 100644 --- a/src/themes/PurpleTheme.js +++ b/src/themes/PurpleTheme.js @@ -143,7 +143,7 @@ const theme = { overrides: { MuiLink: { root:{ - "text-decoration":'none !important' + "text-decoration":'underline !important' } }, },