Skip to content

Commit

Permalink
fix: various UI glitches
Browse files Browse the repository at this point in the history
  • Loading branch information
MichaelTaylor3D committed Sep 19, 2023
1 parent 7be8d73 commit f0136fd
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 10 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "core-registry-cadt-ui",
"version": "1.3.0",
"version": "1.3.1",
"private": true,
"author": "Chia Network Inc. <[email protected]>",
"homepage": "./",
Expand Down
7 changes: 5 additions & 2 deletions src/components/form/PrimaryButton.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ const Button = styled('button')`
max-width: 100%;
background-color: ${props =>
props.danger ? '#FF4D4F' : props.theme.colors.default.secondaryDark};
border: 1px solid #1a8385;
border: none;
border-radius: 5px;
padding: 10px;
height: 32px;
Expand Down Expand Up @@ -74,12 +74,15 @@ const Button = styled('button')`
h4 {
color: ${props.theme.colors.default.secondary};
font-weight: 700 !important;
}
h4:hover {
color: ${props.theme.colors.default.secondaryDark};
font-weight: 700 !important;
}
h4:active {
color: ${props.theme.colors.default.secondary};
font-weight: 700 !important;
}
`;
}
Expand Down Expand Up @@ -117,7 +120,7 @@ const PrimaryButton = ({
<span style={{ width: size === 'small' ? 2 : 5 }}></span>
</>
)}
<ButtonText color={disabled ? '#BFBFBF' : '#0E172B'}>{label}</ButtonText>
<ButtonText color={disabled ? '#BFBFBF' : 'white'}>{label}</ButtonText>
</Button>
);
};
Expand Down
2 changes: 1 addition & 1 deletion src/components/icons/IconColorsWrapper.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ export const IconColorsWrapper = styled('div')`
color: ${props =>
props.type === IconColorsWrapperTypeEnum.red
? props.theme.colors.default.shade2
: props.theme.colors.default.secondary};
: props.theme.colors.default.primary};
:hover {
color: ${props =>
Expand Down
4 changes: 2 additions & 2 deletions src/components/layout/Tabs.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ const StyledTabs = styled(MuiTabs)`
}
button.Mui-selected {
color: ${props => props.theme.colors.default.primaryDark};
color: ${props => props.theme.colors.default.secondaryDark};
}
.MuiTabs-indicator {
background-color: ${props => props.theme.colors.default.primaryDark};
background-color: ${props => props.theme.colors.default.secondaryDark};
}
`;

Expand Down
4 changes: 2 additions & 2 deletions src/components/typography/ButtonText.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ import { useSelector } from 'react-redux';
import styled, { withTheme } from 'styled-components';

const Text = styled('h4')`
color: ${props => props.color || '#6e7d7f'} !important;
color: ${props => props.color || 'white'} !important;
font-size: 1rem;
font-family: ${props => props.theme.typography.primary.regular};
line-height: 1.375rem;
font-style: normal;
font-weight: 400;
font-weight: 700;
text-transform: capitalize;
margin: 0;
padding: 0;
Expand Down
2 changes: 1 addition & 1 deletion src/pages/Projects/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ const StyledCreateOneNowContainer = styled('div')`
margin-left: 0.3125rem;
display: inline-block;
cursor: pointer;
color: #1890ff;
color: ${props => props.theme.colors.default.secondaryDark};
`;

const NoDataMessageContainer = styled('div')`
Expand Down
2 changes: 1 addition & 1 deletion src/pages/Units/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ const StyledCreateOneNowContainer = styled('div')`
margin-left: 0.3125rem;
display: inline-block;
cursor: pointer;
color: #1890ff;
color: ${props => props.theme.colors.default.secondaryDark};
`;

const NoDataMessageContainer = styled('div')`
Expand Down

0 comments on commit f0136fd

Please sign in to comment.