Skip to content

Simplify link styles #48

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.

Sign up for GitHub

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

Open
fed wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Simplify link styles #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 2 additions & 24 deletions src/styles/common.css.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,42 +28,20 @@ export const baseFocusStyleImpl = {
outline: `${borderRadius.default} solid ${colors.pink}`,
outlineOffset: '2px',
borderRadius: '1px',
borderBottomStyle: 'none' as const,
};

export const baseFocusHoverStyleImpl = {
borderBottomStyle: 'none' as const,
textDecoration: 'none',
};

export const baseFocusStyle = style({
selectors: {
'&:focus': baseFocusStyleImpl,
'&:focus:hover': baseFocusHoverStyleImpl,
},
});

export const baseLinkStyleImpl = {
borderBottom: `1px solid ${colors.grayLight}`,
color: colors.blue,
paddingBottom: '1px',
textDecoration: 'none',
transition: 'border-bottom 0.5s ease',
wordBreak: 'break-word' as const,
};

export const baseLinkHoverStyleImpl = {
borderBottom: `1px solid ${colors.blue}`,
};

export const baseLinkStyle = style([
baseFocusStyle,
baseLinkStyleImpl,
{
selectors: {
'&:hover': baseLinkHoverStyleImpl,
},
},
]);
export const baseLinkStyle = style([baseFocusStyle, baseLinkStyleImpl]);

export const srOnlyStyle = style({
borderWidth: 0,
Expand Down
11 changes: 1 addition & 10 deletions src/ui/markdown.css.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,6 @@
import { style, globalStyle } from '@vanilla-extract/css';

import {
baseParagraphStyleImpl,
baseHeadingStyleImpl,
baseLinkStyleImpl,
baseLinkHoverStyleImpl,
baseFocusStyleImpl,
baseFocusHoverStyleImpl,
} from '../styles/common.css';
import { baseParagraphStyleImpl, baseHeadingStyleImpl, baseLinkStyleImpl, baseFocusStyleImpl } from '../styles/common.css';
import { fontFamilies, fontSizes, lineHeights, fontWeights, gridSize, borderRadius } from '../styles/constants';

export const markdownStyle = style({});
Expand All @@ -17,9 +10,7 @@ globalStyle(`${markdownStyle} p, ${markdownStyle} ul, ${markdownStyle} ol`, base

// Links
globalStyle(`${markdownStyle} a`, baseLinkStyleImpl);
globalStyle(`${markdownStyle} a:hover`, baseLinkHoverStyleImpl);
globalStyle(`${markdownStyle} a:focus`, baseFocusStyleImpl);
globalStyle(`${markdownStyle} a:focus:hover`, baseFocusHoverStyleImpl);

// Headings
globalStyle(
Expand Down