Skip to content

Commit

Permalink
Merge branch 'feat/remove-text-underline-in-linkbox-STAR-673' into edge
Browse files Browse the repository at this point in the history
  • Loading branch information
JorisPannekeet committed Jan 7, 2025
2 parents 9ae3ceb + f059fda commit e3d81a7
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 1 deletion.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
# [2.200.0](https://github.com/bettyblocks/material-ui-component-set/compare/v2.199.1...v2.200.0) (2024-12-30)


### Features

* add icon, icon position and icon color options to expansion panel ([8f4db94](https://github.com/bettyblocks/material-ui-component-set/commit/8f4db94025f194ba38d037b6a088978e12ea81ea))

## [2.199.1](https://github.com/bettyblocks/material-ui-component-set/compare/v2.199.0...v2.199.1) (2024-12-16)


Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "component-set",
"version": "2.199.1",
"version": "2.200.0",
"main": "dist/templates.json",
"license": "UNLICENSED",
"private": false,
Expand Down
8 changes: 8 additions & 0 deletions src/components/box.js
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,7 @@
rel={linkTarget === '_blank' ? 'noopener' : ''}
component={hasLink ? BLink : undefined}
endpoint={hasLink ? linkTo : undefined}
className={classes.link}
>
{BoxCmp}
</Link>
Expand Down Expand Up @@ -303,6 +304,13 @@
borderStyle: 'dashed',
backgroundColor: '#F0F1F5',
},
link: {
textDecoration: 'none',
color: 'inherit',
'&:hover': {
textDecoration: 'none !important',
},
},
};
},
}))();

0 comments on commit e3d81a7

Please sign in to comment.