diff --git a/webapp/packages/core-app/src/shared/InlineEditor/InlineEditor.tsx b/webapp/packages/core-app/src/shared/InlineEditor/InlineEditor.tsx index 3f9bf84fa7..9db28c3d7c 100644 --- a/webapp/packages/core-app/src/shared/InlineEditor/InlineEditor.tsx +++ b/webapp/packages/core-app/src/shared/InlineEditor/InlineEditor.tsx @@ -8,9 +8,8 @@ import { observer } from 'mobx-react-lite'; import { - useEffect, useRef, useCallback, ChangeEvent + useEffect, useRef, useCallback, ChangeEvent, useImperativeHandle } from 'react'; -import { useImperativeHandle } from 'react'; import styled, { use } from 'reshadow'; import { Icon, IconOrImage, Loader, useObjectRef } from '@cloudbeaver/core-blocks'; diff --git a/webapp/packages/core-app/src/shared/InlineEditor/styles.ts b/webapp/packages/core-app/src/shared/InlineEditor/styles.ts index 80ca9ea9d3..615dd658ef 100644 --- a/webapp/packages/core-app/src/shared/InlineEditor/styles.ts +++ b/webapp/packages/core-app/src/shared/InlineEditor/styles.ts @@ -49,7 +49,6 @@ export const InlineEditorStyles = composes( display: flex; & input, & input[disabled], & input[readonly] { - font-size: inherit; border: none; border-radius: unset; width: 100%; diff --git a/webapp/packages/core-blocks/src/FormControls/Combobox.tsx b/webapp/packages/core-blocks/src/FormControls/Combobox.tsx index 2fa053745b..369a620e92 100644 --- a/webapp/packages/core-blocks/src/FormControls/Combobox.tsx +++ b/webapp/packages/core-blocks/src/FormControls/Combobox.tsx @@ -41,6 +41,7 @@ const styles = composes( font-weight: 500; } input { + font-size: 12px; padding-right: 24px !important; } MenuButton { diff --git a/webapp/packages/core-blocks/src/FormControls/InputField.tsx b/webapp/packages/core-blocks/src/FormControls/InputField.tsx index 42187d9e63..f16230613d 100644 --- a/webapp/packages/core-blocks/src/FormControls/InputField.tsx +++ b/webapp/packages/core-blocks/src/FormControls/InputField.tsx @@ -51,6 +51,9 @@ const INPUT_FIELD_STYLES = composes( height: 100%; } } + input { + font-size: 12px; + } input[disabled] + icon-container { cursor: auto; opacity: 0.8; diff --git a/webapp/packages/core-blocks/src/FormControls/Textarea.tsx b/webapp/packages/core-blocks/src/FormControls/Textarea.tsx index 98be7cace6..4b3bbe4fc2 100644 --- a/webapp/packages/core-blocks/src/FormControls/Textarea.tsx +++ b/webapp/packages/core-blocks/src/FormControls/Textarea.tsx @@ -18,6 +18,7 @@ import { FormContext } from './FormContext'; const styles = css` textarea { + font-size: 12px; line-height: 19px; } field[|embedded] { diff --git a/webapp/packages/core-blocks/src/ItemList/styles.ts b/webapp/packages/core-blocks/src/ItemList/styles.ts index a8e4ccc3c9..cbe4cf0562 100644 --- a/webapp/packages/core-blocks/src/ItemList/styles.ts +++ b/webapp/packages/core-blocks/src/ItemList/styles.ts @@ -57,6 +57,7 @@ export const ITEM_LIST_STYLES = composes( z-index: 1; } list-search { + composes: theme-typography--body1 from global; position: sticky; top: 0; padding: 16px 24px; @@ -67,10 +68,7 @@ export const ITEM_LIST_STYLES = composes( } & input { - font-size: inherit; - padding-top: 4px; - padding-bottom: 4px; - padding-right: 32px; + padding: 4px 32px 4px 8px; } & search-button { diff --git a/webapp/packages/core-theming/src/styles/_form-controls.scss b/webapp/packages/core-theming/src/styles/_form-controls.scss index dcfcf4ebac..3922eb3160 100644 --- a/webapp/packages/core-theming/src/styles/_form-controls.scss +++ b/webapp/packages/core-theming/src/styles/_form-controls.scss @@ -37,7 +37,6 @@ textarea { box-sizing: border-box; padding: 7px 12px; - font-size: 12px; width: 100%; border: 2px solid; outline: none;