Skip to content

Commit

Permalink
Merge e4554cd into 8574027
Browse files Browse the repository at this point in the history
  • Loading branch information
langermank authored Jul 25, 2024
2 parents 8574027 + e4554cd commit 4ff82aa
Show file tree
Hide file tree
Showing 179 changed files with 21 additions and 10 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.
10 changes: 5 additions & 5 deletions packages/react/src/Checkbox/Checkbox.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@ const StyledCheckbox = styled.input`
&:checked,
&:indeterminate {
background: ${get('colors.accent.fg')};
border-color: ${get('colors.accent.fg')};
background: var(--control-checked-bgColor-rest, ${get('colors.accent.fg')});
border-color: var(--control-checked-borderColor-rest, ${get('colors.accent.fg')});
&::before {
animation: checkmarkIn 80ms cubic-bezier(0.65, 0, 0.35, 1) forwards 80ms;
Expand All @@ -86,12 +86,12 @@ const StyledCheckbox = styled.input`
}
&:disabled {
background-color: ${get('colors.fg.muted')};
border-color: ${get('colors.fg.muted')};
background-color: var(--control-checked-bgColor-disabled, ${get('colors.fg.muted')});
border-color: var(--control-checked-borderColor-disabled, ${get('colors.fg.muted')});
opacity: 1;
&::before {
background-color: ${get('colors.fg.onEmphasis')};
background-color: var(--control-checked-fgColor-disabled, ${get('colors.fg.onEmphasis')});
}
}
Expand Down
12 changes: 10 additions & 2 deletions packages/react/src/Radio/Radio.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,17 @@ const StyledRadio = styled.input`
background-color,
border-color 80ms cubic-bezier(0.33, 1, 0.68, 1); /* checked -> unchecked - add 120ms delay to fully see animation-out */
// radial-gradient creates a smooth transition between the checked "fill" and the border color, which is only visible in high contrast themes
&:checked {
border-color: ${get('colors.accent.fg')};
border-width: var(--base-size-4, 4px);
border-width: 0px;
background: radial-gradient(50% 50% at 50% 50%, ${get(
'colors.canvas.default',
)} 59.5%, var(--control-checked-bgColor-rest, ${get(
'colors.accent.fg',
)}) 59.51%, var(--control-checked-bgColor-rest, ${get(
'colors.accent.fg',
)}) 90.48%, var(--control-checked-borderColor-rest, ${get('colors.accent.fg')}) 90.5%);
);
&:disabled {
cursor: not-allowed;
Expand Down
2 changes: 2 additions & 0 deletions packages/react/src/SegmentedControl/SegmentedControl.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@ type SegmentedControlProps = {
const getSegmentedControlStyles = (props: {isFullWidth?: boolean; size?: SegmentedControlProps['size']}) => ({
backgroundColor: 'segmentedControl.bg',
borderRadius: 2,
border: '1px solid',
borderColor: 'border.default',
display: props.isFullWidth ? 'flex' : 'inline-flex',
fontSize: props.size === 'small' ? 0 : 1,
height: props.size === 'small' ? '28px' : '32px', // TODO: use primitive `control.{small|medium}.size` when it is available
Expand Down
4 changes: 2 additions & 2 deletions packages/react/src/ToggleSwitch/ToggleSwitch.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ const SwitchButton = styled.button<SwitchButtonProps>`
if (props.checked) {
return css`
background-color: ${get('colors.switchTrack.checked.bg')};
border-color: transparent;
border-color: var(--control-checked-borderColor-rest, transparent);
&:hover,
&:focus:focus-visible {
Expand All @@ -158,7 +158,7 @@ const SwitchButton = styled.button<SwitchButtonProps>`
} else {
return css`
background-color: ${get('colors.switchTrack.bg')};
border-color: transparent;
border-color: var(--controlTrack-borderColor-rest, transparent);
&:active {
background-color: ${get('colors.switchTrack.activeBg')};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import {get} from '../../constants'

export const sharedCheckboxAndRadioStyles = css`
appearance: none;
border-color: ${get('colors.neutral.emphasis')};
border-color: var(--control-borderColor-emphasis, ${get('colors.neutral.emphasis')});
border-style: solid;
border-width: ${get('borderWidths.1')};
cursor: pointer;
Expand All @@ -14,6 +14,7 @@ export const sharedCheckboxAndRadioStyles = css`
place-content: center;
position: relative;
width: var(--base-size-16, 16px);
background-color: ${get('colors.canvas.default')};
&:disabled {
background-color: ${get('colors.input.disabledBg')};
Expand Down

0 comments on commit 4ff82aa

Please sign in to comment.