diff --git a/rsconcept/frontend/src/components/Common/Dropdown.tsx b/rsconcept/frontend/src/components/Common/Dropdown.tsx index 6b669ea6..dd57ca5e 100644 --- a/rsconcept/frontend/src/components/Common/Dropdown.tsx +++ b/rsconcept/frontend/src/components/Common/Dropdown.tsx @@ -7,7 +7,7 @@ interface DropdownProps { function Dropdown({ children, dimensions = 'w-fit', stretchLeft }: DropdownProps) { return (
-
+
{children}
diff --git a/rsconcept/frontend/src/components/Common/Form.tsx b/rsconcept/frontend/src/components/Common/Form.tsx index 417016d1..8290359d 100644 --- a/rsconcept/frontend/src/components/Common/Form.tsx +++ b/rsconcept/frontend/src/components/Common/Form.tsx @@ -11,7 +11,7 @@ function Form({ title, onSubmit, dimensions = 'max-w-xs', children }: FormProps) className={`border shadow-md py-2 clr-app px-6 flex flex-col gap-3 ${dimensions}`} onSubmit={onSubmit} > - { title &&

{title}

} + { title &&

{title}

} {children} ); diff --git a/rsconcept/frontend/src/components/Common/SelectMulti.tsx b/rsconcept/frontend/src/components/Common/SelectMulti.tsx index b146d5aa..bfa68d7f 100644 --- a/rsconcept/frontend/src/components/Common/SelectMulti.tsx +++ b/rsconcept/frontend/src/components/Common/SelectMulti.tsx @@ -35,6 +35,10 @@ function SelectMulti< borderWidth: '1px', borderColor: colors.border }), + menuList: (styles) => ({ + ...styles, + padding: '0px' + }), input: (styles) => ({...styles}), placeholder: (styles) => ({...styles}), multiValue: styles => ({ diff --git a/rsconcept/frontend/src/components/Common/SelectSingle.tsx b/rsconcept/frontend/src/components/Common/SelectSingle.tsx index 581558d3..4bb57e61 100644 --- a/rsconcept/frontend/src/components/Common/SelectSingle.tsx +++ b/rsconcept/frontend/src/components/Common/SelectSingle.tsx @@ -27,6 +27,10 @@ function SelectSingle< borderRadius: '0.25rem', cursor: isDisabled ? 'not-allowed' : 'pointer' }), + menuList: (styles) => ({ + ...styles, + padding: '0px' + }), option: (styles, { isSelected }) => ({ ...styles, backgroundColor: isSelected ? colors.bgSelected : styles.backgroundColor, diff --git a/rsconcept/frontend/src/components/Navigation/UserDropdown.tsx b/rsconcept/frontend/src/components/Navigation/UserDropdown.tsx index 904f1d6b..f26946b0 100644 --- a/rsconcept/frontend/src/components/Navigation/UserDropdown.tsx +++ b/rsconcept/frontend/src/components/Navigation/UserDropdown.tsx @@ -1,7 +1,6 @@ import { useAuth } from '../../context/AuthContext'; import { useConceptNavigation } from '../../context/NagivationContext'; import { useConceptTheme } from '../../context/ThemeContext'; -import { LibraryFilterStrategy } from '../../models/miscelanious'; import Dropdown from '../Common/Dropdown'; import DropdownButton from '../Common/DropdownButton'; @@ -25,11 +24,6 @@ function UserDropdown({ hideDropdown }: UserDropdownProps) { logout(() => navigateTo('/login/')); }; - const navigateMyWork = () => { - hideDropdown(); - navigateTo(`/library?filter=${LibraryFilterStrategy.PERSONAL}`); - }; - return ( {darkMode ? 'Светлая тема' : 'Темная тема'} - - Мои схемы - Выйти... diff --git a/rsconcept/frontend/src/components/RefsInput/DlgEditReference.tsx b/rsconcept/frontend/src/components/RefsInput/DlgEditReference.tsx index 9d7651dc..0d9dfd70 100644 --- a/rsconcept/frontend/src/components/RefsInput/DlgEditReference.tsx +++ b/rsconcept/frontend/src/components/RefsInput/DlgEditReference.tsx @@ -229,7 +229,7 @@ function DlgEditReference({ hideWindow, items, initial, onSave }: DlgEditReferen canSubmit={isValid} onSubmit={handleSubmit} > -
+
onSelect(type)} - className={`min-w-[12rem] px-2 py-1 border font-semibold rounded-none cursor-pointer clr-btn-clear clr-hover ${isSelected ? 'clr-selected': ''}`} + className={`min-w-[12rem] px-2 py-1 border font-semibold small-caps rounded-none cursor-pointer clr-btn-clear clr-hover ${isSelected ? 'clr-selected': ''}`} {...props} > {labelReferenceType(type)} diff --git a/rsconcept/frontend/src/index.css b/rsconcept/frontend/src/index.css index b6583729..aac11cf5 100644 --- a/rsconcept/frontend/src/index.css +++ b/rsconcept/frontend/src/index.css @@ -122,7 +122,11 @@ @layer components { h1 { - @apply text-lg font-bold text-center + @apply text-lg font-semibold text-center + } + + b { + @apply font-semibold } .border { diff --git a/rsconcept/frontend/src/pages/ManualsPage/TopicsList.tsx b/rsconcept/frontend/src/pages/ManualsPage/TopicsList.tsx index 5623e6af..054c370a 100644 --- a/rsconcept/frontend/src/pages/ManualsPage/TopicsList.tsx +++ b/rsconcept/frontend/src/pages/ManualsPage/TopicsList.tsx @@ -9,8 +9,8 @@ interface TopicsListProps { function TopicsList({ activeTopic, onChangeTopic }: TopicsListProps) { return ( -
-
Справка
+
+
Справка
{ Object.values(HelpTopic).map( (topic, index) => { return ( diff --git a/rsconcept/frontend/src/pages/ManualsPage/index.tsx b/rsconcept/frontend/src/pages/ManualsPage/index.tsx index 3bf88c91..290ca85a 100644 --- a/rsconcept/frontend/src/pages/ManualsPage/index.tsx +++ b/rsconcept/frontend/src/pages/ManualsPage/index.tsx @@ -34,7 +34,7 @@ function ManualsPage() { }, [search, setActiveTopic, navigateTopic]); return ( -
+
onSelectTopic(topic)} diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorConstituenta.tsx b/rsconcept/frontend/src/pages/RSFormPage/EditorConstituenta.tsx index 7e222c1f..905dd30c 100644 --- a/rsconcept/frontend/src/pages/RSFormPage/EditorConstituenta.tsx +++ b/rsconcept/frontend/src/pages/RSFormPage/EditorConstituenta.tsx @@ -136,8 +136,8 @@ function EditorConstituenta({ } return ( -
-
+
+
{activeCst && @@ -249,7 +249,7 @@ function EditorConstituenta({
{(windowSize.width ?? 0) >= SIDELIST_HIDE_THRESHOLD && -
+
{ + return !noNavigation ? + 'calc(100vh - 4.8rem - 4px)' + : 'calc(100vh - 2rem - 4px)'; + }, [noNavigation]); + useLayoutEffect(() => { if (schema) { const oldTitle = document.title @@ -386,48 +393,50 @@ function RSTabs() { Граф термов - - - {schema.stats && } - +
+ + + {schema.stats && } + - - - + + + - - - + + + - - - + + + +
}
); diff --git a/rsconcept/frontend/src/pages/RSFormPage/elements/ViewSideConstituents.tsx b/rsconcept/frontend/src/pages/RSFormPage/elements/ViewSideConstituents.tsx index 5fcf920b..edc1680b 100644 --- a/rsconcept/frontend/src/pages/RSFormPage/elements/ViewSideConstituents.tsx +++ b/rsconcept/frontend/src/pages/RSFormPage/elements/ViewSideConstituents.tsx @@ -206,8 +206,8 @@ function ViewSideConstituents({ expression, baseHeight, activeID, onOpenEdit }: () => { const siblingHeight = `${baseHeight} - ${LOCAL_NAVIGATION_H}` return (noNavigation ? - `calc(min(100vh - 5.2rem, ${siblingHeight}))` - : `calc(min(100vh - 8.7rem, ${siblingHeight}))`); + `calc(min(100vh - 7.2rem, ${siblingHeight}))` + : `calc(min(100vh - 10.7rem, ${siblingHeight}))`); }, [noNavigation, baseHeight]); return (<>