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.

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

[Patch] Button.tertiary colors to match design #218

Merged
merged 1 commit into from
Oct 23, 2019
Merged

[Patch] Button.tertiary colors to match design #218

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
4 changes: 2 additions & 2 deletions src/core/Button/Button.baseStyles.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,11 +71,11 @@ const secondaryNoBorderStyles = ({ theme }: SuomifiThemeProp) => css`
const tertiaryStyles = ({ theme }: SuomifiThemeProp) => css`
&.fi-button--tertiary {
${secondary({ theme })}
background: ${theme.colors.highlightLight50};
background: ${theme.gradients.highlightLight45ToHighlightLight50};
ketsappi marked this conversation as resolved.
Show resolved Hide resolved
border: none;

&:hover {
background: ${theme.colors.highlightLight53};
background: ${theme.colors.highlightLight50};
}

&:active {
Expand Down
4 changes: 2 additions & 2 deletions src/core/Button/__snapshots__/Button.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ exports[`calling render with the same component on the same container does not r
background-color: hsl(0,0%,100%);
border: 1px solid hsl(212,63%,45%);
text-shadow: none;
background: hsl(212,63%,95%);
background: linear-gradient(0deg,hsl(212,63%,90%),hsl(212,63%,95%));
border: none;
}

Expand All @@ -232,7 +232,7 @@ exports[`calling render with the same component on the same container does not r
}

.c0.fi-button--tertiary:hover {
background: hsl(212,63%,98%);
background: hsl(212,63%,95%);
}

.c0.fi-button--tertiary:active {
Expand Down
3 changes: 3 additions & 0 deletions src/core/theme/colors.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,9 @@ export const gradients = {
depthLight26: `linear-gradient(0deg, ${colors.depthLight26} 0%, ${
colors.whiteBase
} 100%)`,
highlightLight45ToHighlightLight50: `linear-gradient(0deg, ${
colors.highlightLight45
}, ${colors.highlightLight50})`,
};

export const outlines = {
Expand Down