Skip to content

Commit

Permalink
Merge pull request #37 from mavka-org/main
Browse files Browse the repository at this point in the history
minor fixes
  • Loading branch information
arlaptiev authored May 21, 2021
2 parents b2c120a + 9f2edff commit 97c6e60
Show file tree
Hide file tree
Showing 4 changed files with 34 additions and 1 deletion.
1 change: 1 addition & 0 deletions src/components/content/ContentInfoBlock.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
},

}));
Expand Down
20 changes: 20 additions & 0 deletions src/components/elements/Link.js
Original file line number Diff line number Diff line change
@@ -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 (
<MuiLink {...props} style={style} className={classNames}>
{children}
</MuiLink>
);
}

export default Link;
12 changes: 12 additions & 0 deletions src/stories/elements/Link.stories.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import React from 'react';

import Link from '../../components/elements/Link';
import { Typography } from '@material-ui/core';

export default {
title: 'Elements/Link',
component: Link
};


export const Default = () => <Typography><Link href='https://google.com' target='_blank'>This is a Default Link for style and external links/new tab.</Link></Typography>
2 changes: 1 addition & 1 deletion src/themes/PurpleTheme.js
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ const theme = {
overrides: {
MuiLink: {
root:{
"text-decoration":'none !important'
"text-decoration":'underline !important'
}
},
},
Expand Down

0 comments on commit 97c6e60

Please sign in to comment.