diff --git a/rsconcept/frontend/src/app/Navigation/NavigationButton.tsx b/rsconcept/frontend/src/app/Navigation/NavigationButton.tsx index c542686f..9efd416b 100644 --- a/rsconcept/frontend/src/app/Navigation/NavigationButton.tsx +++ b/rsconcept/frontend/src/app/Navigation/NavigationButton.tsx @@ -29,8 +29,9 @@ export function NavigationButton({ data-tooltip-hidden={hideTitle} onClick={onClick} className={clsx( - 'mr-1 h-full', // + 'mr-1 h-full', 'flex items-center gap-1', + 'cursor-pointer', 'clr-btn-nav cc-animate-color duration-500', 'rounded-xl', 'font-controls whitespace-nowrap', diff --git a/rsconcept/frontend/src/components/Input/SearchBar.tsx b/rsconcept/frontend/src/components/Input/SearchBar.tsx index 6daa3df8..8c8630ca 100644 --- a/rsconcept/frontend/src/components/Input/SearchBar.tsx +++ b/rsconcept/frontend/src/components/Input/SearchBar.tsx @@ -50,7 +50,8 @@ export function SearchBar({ noOutline placeholder={placeholder} type='search' - className={clsx('outline-hidden bg-transparent', !noIcon && 'pl-10')} + colors='bg-transparent' + className={clsx(!noIcon && 'pl-10')} noBorder={noBorder} value={query} onChange={event => onChangeQuery?.(event.target.value)} diff --git a/rsconcept/frontend/src/features/oss/pages/OssPage/MenuOssTabs.tsx b/rsconcept/frontend/src/features/oss/pages/OssPage/MenuOssTabs.tsx index 1670f22f..46b195a8 100644 --- a/rsconcept/frontend/src/features/oss/pages/OssPage/MenuOssTabs.tsx +++ b/rsconcept/frontend/src/features/oss/pages/OssPage/MenuOssTabs.tsx @@ -71,7 +71,7 @@ export function MenuOssTabs() { } return ( -
+
diff --git a/rsconcept/frontend/src/features/rsform/components/WordformButton.tsx b/rsconcept/frontend/src/features/rsform/components/WordformButton.tsx index dd383c99..23191cd9 100644 --- a/rsconcept/frontend/src/features/rsform/components/WordformButton.tsx +++ b/rsconcept/frontend/src/features/rsform/components/WordformButton.tsx @@ -1,6 +1,6 @@ import clsx from 'clsx'; -import { Grammeme } from '../models/language'; +import { type Grammeme } from '../models/language'; interface WordformButtonProps { text: string; diff --git a/rsconcept/frontend/src/features/rsform/dialogs/DlgCstTemplate/TabArguments.tsx b/rsconcept/frontend/src/features/rsform/dialogs/DlgCstTemplate/TabArguments.tsx index 98450453..1f45f186 100644 --- a/rsconcept/frontend/src/features/rsform/dialogs/DlgCstTemplate/TabArguments.tsx +++ b/rsconcept/frontend/src/features/rsform/dialogs/DlgCstTemplate/TabArguments.tsx @@ -188,7 +188,7 @@ export function TabArguments() { noTooltip id='result' placeholder='Итоговое определение' - className='mt-[1.2rem]' + className='mt-[1.1rem]' height='5.1rem' value={definition} /> diff --git a/rsconcept/frontend/src/features/rsform/dialogs/DlgInlineSynthesis/TabSubstitutions.tsx b/rsconcept/frontend/src/features/rsform/dialogs/DlgInlineSynthesis/TabSubstitutions.tsx index e3745c9d..17914877 100644 --- a/rsconcept/frontend/src/features/rsform/dialogs/DlgInlineSynthesis/TabSubstitutions.tsx +++ b/rsconcept/frontend/src/features/rsform/dialogs/DlgInlineSynthesis/TabSubstitutions.tsx @@ -30,7 +30,7 @@ export function TabSubstitutions() { allowSelfSubstitution={selfSubstitution} rows={10} schemas={selfSubstitution ? [source] : [source, receiver]} - filterCst={selected.length === 0 ? undefined : cst => selected.includes(cst.id)} + filterCst={selected.length === 0 ? undefined : cst => cst.schema !== source.id || selected.includes(cst.id)} /> )} /> diff --git a/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorConstituenta/ToolbarConstituenta.tsx b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorConstituenta/ToolbarConstituenta.tsx index d0a701a6..8537c2c8 100644 --- a/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorConstituenta/ToolbarConstituenta.tsx +++ b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorConstituenta/ToolbarConstituenta.tsx @@ -80,7 +80,7 @@ export function ToolbarConstituenta({ return ( {schema.oss.length > 0 ? ( diff --git a/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorRSList/ToolbarRSList.tsx b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorRSList/ToolbarRSList.tsx index daa7d2f7..7a229771 100644 --- a/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorRSList/ToolbarRSList.tsx +++ b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorRSList/ToolbarRSList.tsx @@ -49,7 +49,7 @@ export function ToolbarRSList() { return ( {schema.oss.length > 0 ? ( diff --git a/rsconcept/frontend/src/features/rsform/pages/RSFormPage/MenuRSTabs.tsx b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/MenuRSTabs.tsx index ccfefa7a..a5eda8ed 100644 --- a/rsconcept/frontend/src/features/rsform/pages/RSFormPage/MenuRSTabs.tsx +++ b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/MenuRSTabs.tsx @@ -222,7 +222,7 @@ export function MenuRSTabs() { } return ( -
+