Skip to content

Commit

Permalink
Merge branch 'main' into feat-progress-text
Browse files Browse the repository at this point in the history
  • Loading branch information
Lunory authored Dec 18, 2024
2 parents a982368 + d6cda6e commit 05a2474
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 3 deletions.
1 change: 0 additions & 1 deletion src/components/Icon/Icon.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
$block: '.#{variables.$ns}icon';

#{$block} {
color: inherit;
line-height: 0;
vertical-align: top;
}
8 changes: 6 additions & 2 deletions src/components/Select/components/SelectList/OptionWrap.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,12 @@ type OptionWrapProps = {
};

const DefaultOption = ({option}: DefaultOptionProps) => {
const {content, children, disabled} = option;
return <span className={b('option-default-label', {disabled})}>{content || children}</span>;
const {content, children, disabled, title} = option;
return (
<span title={title} className={b('option-default-label', {disabled})}>
{content || children}
</span>
);
};

export const OptionWrap = (props: OptionWrapProps) => {
Expand Down
15 changes: 15 additions & 0 deletions styles/styles.scss
Original file line number Diff line number Diff line change
Expand Up @@ -73,3 +73,18 @@
:root:has(body.g-root_theme_dark-hc) {
color-scheme: dark;
}

@media (prefers-reduced-motion: reduce) {
*,
*::before,
*::after {
/* stylelint-disable-next-line declaration-no-important */
scroll-behavior: auto !important;
/* stylelint-disable-next-line declaration-no-important */
transition-duration: 0.001ms !important;
/* stylelint-disable-next-line declaration-no-important */
animation-duration: 0.001ms !important;
/* stylelint-disable-next-line declaration-no-important */
animation-iteration-count: 1 !important;
}
}

0 comments on commit 05a2474

Please sign in to comment.