Skip to content

Commit

Permalink
Merge pull request #799 from securityscorecard/next
Browse files Browse the repository at this point in the history
🚀  Next release 1.6.0
  • Loading branch information
ajkl2533 authored Jul 12, 2023
2 parents e0b853a + c6e4406 commit 158a1ab
Show file tree
Hide file tree
Showing 180 changed files with 330 additions and 236 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.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,8 @@
"@babel/types": "^7.17.10",
"@betterer/cli": "^5.1.7",
"@betterer/eslint": "^5.1.7",
"@commitlint/cli": "^16.2.3",
"@commitlint/config-conventional": "^16.2.1",
"@commitlint/cli": "^17.6.6",
"@commitlint/config-conventional": "^17.6.6",
"@fontsource/inter": "^4.5.15",
"@geometricpanda/storybook-addon-badges": "^0.2.1",
"@mdx-js/react": "^1.6.22",
Expand Down
3 changes: 2 additions & 1 deletion src/components/Accordion/Accordion.stories.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import { Paragraph, Text } from '../typographyLegacy';
import { Button } from '../Button';
import Accordion from './Accordion';
import { AccordionProps } from './Accordion.types';
import { TextSizes } from '../typographyLegacy/Text/Text.enums';

export default {
title: 'components/Accordion',
Expand Down Expand Up @@ -53,7 +54,7 @@ const AccordionItemTitle = () => (
<Stack gap="sm">
<Inline align="center" gap="md">
<HexGrade grade="A" size={24} />
<Text>Company Name</Text>
<Text size={TextSizes.lg}>Company Name</Text>
</Inline>
<Paragraph>
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod
Expand Down
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/components/forms/Range/Range.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ const Range = forwardRef<HTMLInputElement, RangeProps>(
$left={calcPercentage(rangeValue, min, max)}
isDisabled={isDisabled}
>
{rangeValue}
<Text>{rangeValue}</Text>
</RangeValue>
</RangeValueContainer>
</Stack>
Expand Down
1 change: 1 addition & 0 deletions src/components/forms/Select/Select.styles.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,7 @@ export const selectStyles: (
fontSize: DSTheme.typography.size.md,
lineHeight: DSTheme.typography.lineHeight.md,
display: isEmptyString(children) ? 'none' : 'block',
position: 'absolute',
}),
indicatorsContainer: (styles) => ({
...styles,
Expand Down
2 changes: 1 addition & 1 deletion src/components/typographyLegacy/Paragraph/Paragraph.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ Paragraph.propTypes = {
};

Paragraph.defaultProps = {
size: TextSizes.lg,
size: TextSizes.md,
variant: TextVariants.primary,
as: 'p',
};
Expand Down
6 changes: 4 additions & 2 deletions src/components/typographyLegacy/Text/Text.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ Text.propTypes = {
};

Text.defaultProps = {
size: TextSizes.lg,
size: TextSizes.md,
variant: TextVariants.primary,
isBold: false,
};
Expand All @@ -129,12 +129,14 @@ export default Text;
export const Strong = styled(Text).attrs<StrongProps>(() => ({
as: 'strong',
isBold: true,
size: TextSizes.inherit,
}))``;

Strong.propTypes = {
variant: PropTypes.oneOf(Object.values(TextVariants)),
};
Strong.defaultProps = {
size: TextSizes.inherit,
};

export const Code = styled(Text).attrs<CodeProps>(() => ({
variant: TextVariants.monospace,
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
16 changes: 8 additions & 8 deletions visual-regressions/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2142,20 +2142,20 @@ __metadata:
linkType: hard

"semver@npm:2 || 3 || 4 || 5, semver@npm:^5.5.0":
version: 5.7.1
resolution: "semver@npm:5.7.1"
version: 5.7.2
resolution: "semver@npm:5.7.2"
bin:
semver: ./bin/semver
checksum: 57fd0acfd0bac382ee87cd52cd0aaa5af086a7dc8d60379dfe65fea491fb2489b6016400813930ecd61fd0952dae75c115287a1b16c234b1550887117744dfaf
semver: bin/semver
checksum: fb4ab5e0dd1c22ce0c937ea390b4a822147a9c53dbd2a9a0132f12fe382902beef4fbf12cf51bb955248d8d15874ce8cd89532569756384f994309825f10b686
languageName: node
linkType: hard

"semver@npm:^6.0.0":
version: 6.3.0
resolution: "semver@npm:6.3.0"
version: 6.3.1
resolution: "semver@npm:6.3.1"
bin:
semver: ./bin/semver.js
checksum: 1b26ecf6db9e8292dd90df4e781d91875c0dcc1b1909e70f5d12959a23c7eebb8f01ea581c00783bbee72ceeaad9505797c381756326073850dc36ed284b21b9
semver: bin/semver.js
checksum: ae47d06de28836adb9d3e25f22a92943477371292d9b665fb023fae278d345d508ca1958232af086d85e0155aee22e313e100971898bbb8d5d89b8b1d4054ca2
languageName: node
linkType: hard

Expand Down
Loading

0 comments on commit 158a1ab

Please sign in to comment.