Skip to content

Commit

Permalink
feat(GlobalStyles): change base font size
Browse files Browse the repository at this point in the history
Ref UXD-1215
  • Loading branch information
ajkl2533 committed Jul 11, 2023
1 parent 7db54d3 commit 8276489
Show file tree
Hide file tree
Showing 138 changed files with 6 additions and 8 deletions.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified .storybook/image-snapshots/expected/components_Icon_Icons List.png
7 changes: 2 additions & 5 deletions src/components/Callout/Callout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import { getColor, getFontSize, getRadii, pxToRem } from '../../utils';
import { Inline, Padbox } from '../layout';
import { Text } from '../typographyLegacy';
import { Icon } from '../Icon';
import { TextSizes } from '../typographyLegacy/Text/Text.enums';
import { SSCIcons } from '../Icon/Icon.types';
import { SSCIconNames } from '../../theme/icons/icons.enums';
import { CalloutColors } from './Callout.enums';
Expand All @@ -33,7 +32,7 @@ const IconContainer = styled.div<CalloutContainerProps>`
display: flex;
align-items: center;
justify-content: center;
font-size: ${getFontSize('mdPlus')};
font-size: ${getFontSize('lg')};
${({ $color }) => calloutIconColors[$color]};
`;

Expand Down Expand Up @@ -77,9 +76,7 @@ const Callout: React.FC<CalloutProps> = ({
icon
)}
</IconContainer>
<Text size={TextSizes.lg} style={{ alignSelf: 'center' }}>
{children}
</Text>
<Text style={{ alignSelf: 'center' }}>{children}</Text>
</Inline>
</Container>
);
Expand Down
4 changes: 2 additions & 2 deletions src/components/Card/CardHeader.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,12 @@ export const CardIconButton = styled.button<{
background-color: ${({ $isActive }) =>
$isActive ? getColor('primary.50') : 'transparent'};
border: none;
box-sizing: content-box;
color: ${getColor('neutral.800')};
display: flex;
align-items: center;
border-radius: ${getRadii('default')};
padding: ${getSpace(SpaceSizes.sm)};
height: 2rem;
${(props) =>
props.as !== 'div' &&
css`
Expand Down Expand Up @@ -82,7 +83,6 @@ const StyledIcon = styled(Icon).withConfig<{ color: Color }>({
shouldForwardProp: (property) => !includes(property, ['color']),
})`
background: ${getColor('neutral.0')};
border: 1px solid ${getColor('neutral.0')};
border-radius: 100%;
color: ${({ color, theme }) =>
isNotUndefined(color) ? getColor(color, { theme }) : 'inherit'};
Expand Down
1 change: 1 addition & 0 deletions src/components/forms/Password/Password.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ const ToggleButton = styled.button`
width: ${pxToRem(16)};
position: absolute;
top: 0;
bottom: 0;
right: 0;
${({ theme }) =>
createPadding({
Expand Down
2 changes: 1 addition & 1 deletion src/theme/GlobalStyles/GlobalStyles.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ export default createGlobalStyle`
background: ${getColor('neutral.0')};
font-family: ${getFontFamily('base')};
font-weight: ${getFontWeight('regular')};
font-size: ${pxToRem(BASE_FONT_SIZE)};
font-size: ${pxToRem(BASE_FONT_SIZE * 0.875)};
line-height: ${pxToRem(BASE_LINE_HEIGHT)};
color: ${getColor('neutral.900')};
}
Expand Down

0 comments on commit 8276489

Please sign in to comment.