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: fixing color of buttons #5179

Merged
merged 13 commits into from Nov 14, 2022
1 change: 1 addition & 0 deletions src/nft/components/bag/Bag.tsx
Expand Up @@ -315,6 +315,7 @@ const Bag = () => {
paddingY="10"
className={`${buttonTextMedium} ${commonButtonStyles}`}
backgroundColor="accentAction"
color="white"
textAlign="center"
onClick={() => {
isMobile && toggleBag()
Expand Down
2 changes: 1 addition & 1 deletion src/nft/components/bag/BagFooter.css.ts
Expand Up @@ -36,7 +36,7 @@ export const warningContainer = style([
export const payButton = style([
body,
sprinkles({
background: 'blue400',
background: 'accentAction',
border: 'none',
borderRadius: '12',
paddingY: '12',
Expand Down
4 changes: 0 additions & 4 deletions src/nft/components/bag/BagHeader.tsx
Expand Up @@ -13,10 +13,6 @@ const ClearButton = styled(ButtonText)`
font-size: 14px;
line-height: 16px;
transition: 150ms ease color;

:hover {
color: ${({ theme }) => theme.accentActive};
}
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we had a random blue hoverstate

`
const ControlRow = styled.div`
align-items: center;
Expand Down
2 changes: 1 addition & 1 deletion src/nft/components/collection/FilterButton.tsx
Expand Up @@ -37,7 +37,7 @@ export const FilterButton = ({
width={isMobile ? '44' : 'auto'}
height="44"
whiteSpace="nowrap"
color="textPrimary"
color="white"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

are we sure we want to hardcode this tow hite?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is a merge conflict, i changed this upstream

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Screen Shot 2022-11-14 at 9 40 02 AM

This is what it looks like with textPrimary

>
<FilterIcon />
{!isMobile ? (
Expand Down
9 changes: 8 additions & 1 deletion src/nft/components/profile/view/ProfilePage.tsx
Expand Up @@ -43,12 +43,19 @@ const SellModeButton = styled.button<{ active: boolean }>`
gap: 8px;
cursor: pointer;
background-color: ${({ theme, active }) => (active ? theme.accentAction : theme.backgroundInteractive)};
color: ${({ theme }) => theme.textPrimary};
color: ${({ active, theme }) => (active ? 'white' : theme.textPrimary)};
border: none;
outline: none;
&:hover {
background-color: ${({ theme }) => theme.accentAction};
color: white;
}

transition: ${({
theme: {
transition: { duration, timing },
},
}) => `${duration.fast} all ${timing.ease}`};
`

const ProfilePageColumn = styled(Column)`
Expand Down
1 change: 0 additions & 1 deletion src/nft/css/common.css.ts
Expand Up @@ -41,7 +41,6 @@ export const commonButtonStyles = style([
sprinkles({
borderRadius: '12',
transition: '250',
boxShadow: { hover: 'elevation' },
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

common button styles has a boxShadow. Not a heavily used style, but we removed boxShadows from buttons

}),
{
border: 'none',
Expand Down