Browse Source

Merge remote-tracking branch 'origin/master' into feature-merge-master

pull/41527/head
二货机器人 2 years ago
parent
commit
5ad2a13b1b
  1. 10
      components/checkbox/style/index.ts
  2. 1
      components/time-picker/locale/de_DE.ts

10
components/checkbox/style/index.ts

@ -1,7 +1,7 @@
import { Keyframes } from '@ant-design/cssinjs';
import { genFocusOutline, resetComponent } from '../../style';
import type { FullToken, GenerateStyle } from '../../theme/internal';
import { genComponentStyleHook, mergeToken } from '../../theme/internal';
import { genFocusOutline, resetComponent } from '../../style';
export interface ComponentToken {}
@ -80,12 +80,14 @@ export const genCheckboxStyle: GenerateStyle<CheckboxToken> = (token) => {
// Wrapper > Checkbox > input
[`${checkboxCls}-input`]: {
position: 'absolute',
inset: 0,
// Since baseline align will get additional space offset,
// we need to move input to top to make it align with text.
// Ref: https://github.com/ant-design/ant-design/issues/38926#issuecomment-1486137799
inset: `-0.2em 0`,
zIndex: 1,
width: '100%',
height: '100%',
cursor: 'pointer',
opacity: 0,
margin: 0,
[`&:focus-visible + ${checkboxCls}-inner`]: {
...genFocusOutline(token),

1
components/time-picker/locale/de_DE.ts

@ -2,6 +2,7 @@ import type { TimePickerLocale } from '../index';
const locale: TimePickerLocale = {
placeholder: 'Zeit auswählen',
rangePlaceholder: ['Anfangszeit', 'Endzeit'],
};
export default locale;

Loading…
Cancel
Save