Skip to content

Commit

Permalink
fix: rebase fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
amje committed Feb 1, 2024
1 parent 09d3510 commit c1759c1
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 11 deletions.
2 changes: 2 additions & 0 deletions src/components/Button/__tests__/Button.visual.test.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import React from 'react';

import {test} from '~playwright/core';

import {
Default,
Disabled,
Expand Down
3 changes: 2 additions & 1 deletion src/components/Table/__tests__/Table.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ import React from 'react';
import userEvent from '@testing-library/user-event';

import {render, screen, within} from '../../../../test-utils/utils';
import {Table, TableProps} from '../Table';
import type {TableProps} from '../Table';
import {Table} from '../Table';

import {columns, data} from './utils';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,10 @@ import React from 'react';
import {render, screen} from '@testing-library/react';
import userEvent from '@testing-library/user-event';

import {Table, TableColumnConfig} from '../../../Table';
import {TableSettingsData, withTableSettings} from '../withTableSettings';
import type {TableColumnConfig} from '../../../Table';
import {Table} from '../../../Table';
import type {TableSettingsData} from '../withTableSettings';
import {withTableSettings} from '../withTableSettings';

const item = {name: 'John Doe', occupation: 'Worker'};

Expand Down
24 changes: 16 additions & 8 deletions src/components/controls/TextInput/TextInput.scss
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,10 @@
@include mixins.text-body-short;

line-height: calc(
#{variables.$s-height} -
var(--g-text-input-border-width, #{control-variables.$border-width}) *
#{variables.$s-height} - var(
--g-text-input-border-width,
#{control-variables.$border-width}
) *
2
);
padding-block: 0;
Expand All @@ -20,8 +22,10 @@
@include mixins.text-body-short;

line-height: calc(
#{variables.$m-height} -
var(--g-text-input-border-width, #{control-variables.$border-width}) *
#{variables.$m-height} - var(
--g-text-input-border-width,
#{control-variables.$border-width}
) *
2
);
padding-block: 0;
Expand All @@ -32,8 +36,10 @@
@include mixins.text-body-short;

line-height: calc(
#{variables.$l-height} -
var(--g-text-input-border-width, #{control-variables.$border-width}) *
#{variables.$l-height} - var(
--g-text-input-border-width,
#{control-variables.$border-width}
) *
2
);
padding-block: 0;
Expand All @@ -44,8 +50,10 @@
@include mixins.text-body-2;

line-height: calc(
#{variables.$xl-height} -
var(--g-text-input-border-width, #{control-variables.$border-width}) *
#{variables.$xl-height} - var(
--g-text-input-border-width,
#{control-variables.$border-width}
) *
2
);
padding-block: 0;
Expand Down

0 comments on commit c1759c1

Please sign in to comment.