Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: удаление компонента Link #489

Merged
merged 3 commits into from
Sep 20, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion src/components/author-page/overview/overview.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,13 @@
min-width: 25px;
}

.tagLink {
display: inline-block;
border-bottom: 1px solid currentColor;
color: inherit;
text-decoration: none;
}

.overviewContacts {
max-width: 610px;
}
Expand Down Expand Up @@ -261,7 +268,7 @@
}

.overviewTagsBlock {
margin: 0 0 53px;
margin: 0 0 45px;
}

.overviewSocialLinkBlock {
Expand Down
16 changes: 6 additions & 10 deletions src/components/author-page/overview/overview.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ import { PlayList } from 'components/play-list';
import { Section } from 'components/section';
import { Button } from 'components/ui/button';
import { InfoLink } from 'components/ui/info-link';
import { Link } from 'components/ui/link';
import { Tag } from 'components/ui/tag';
import * as breakpoints from 'shared/breakpoints.js';
import { numberOfCharacters } from 'shared/constants/numbers';
import { useMediaQuery } from 'shared/hooks/use-media-query';
Expand Down Expand Up @@ -170,14 +168,12 @@ export const AuthorOverview: React.FC<IAuthorOverview> = (props) => {
<div className={cx('tagWrapper')}>
{achievements.map((item, idx) => (
<div className={cx('tag')} key={idx}>
<Link href={`library/?festival=${item.year}&program=${item.id}`}>
<a>
<Tag
label={`${item.name} ${item.year}`}
selected={false}
/>
</a>
</Link>
<InfoLink
label={`${item.name} ${item.year}`}
href={`library/?festival=${item.year}&program=${item.id}`}
border='borderLeftBottomRight'
size='textMedium'
/>
</div>
)
)}
Expand Down
12 changes: 12 additions & 0 deletions src/components/ui/info-link/info-link.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,14 @@
border-left: 1px solid var(--coal);
}

.borderLeftBottomRight {
display: inline-block;
padding: 4px 8px 8px;
border-right: 1px solid var(--coal);
border-bottom: 1px solid var(--coal);
border-left: 1px solid var(--coal);
}

.borderTop {
width: inherit;
justify-content: space-between;
Expand Down Expand Up @@ -162,3 +170,7 @@
@mixin headline;
@mixin headline4;
}

.textMedium {
@mixin textMedium;
}
4 changes: 2 additions & 2 deletions src/components/ui/info-link/info-link.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ export interface ILinkProps {
icon?: IIconProps['glyph']
iconPlace?: 'iconNone' | 'left' | 'right'
hoverStyle?: 'invert' | 'bottomLine' | 'bottomLineAndInvert'
size?: 'xs' | 's' | 'm' | 'l' | 'xl' | 'number'
size?: 'xs' | 's' | 'm' | 'l' | 'xl' | 'number' | 'textMedium'
textDecoration?: 'textDecorationNone' | 'underline'
textTransform?: 'uppercase'
border?: 'borderNone' | 'borderBottomLeft' | 'borderTop'
border?: 'borderNone' | 'borderBottomLeft' | 'borderTop' | 'borderLeftBottomRight'
className?: string
iconClassName?: string
}
Expand Down
1 change: 0 additions & 1 deletion src/components/ui/link/index.ts

This file was deleted.

11 changes: 0 additions & 11 deletions src/components/ui/link/link.module.css

This file was deleted.

24 changes: 0 additions & 24 deletions src/components/ui/link/link.tsx

This file was deleted.