diff --git a/src/components/left/search/LeftSearch.scss b/src/components/left/search/LeftSearch.scss index d639599ee..e23e4e3ff 100644 --- a/src/components/left/search/LeftSearch.scss +++ b/src/components/left/search/LeftSearch.scss @@ -249,6 +249,11 @@ > .PickerSelectedItem { flex-shrink: 0; } + + &::after { + content: ""; + flex-grow: 1; + } } .NothingFound { diff --git a/src/components/middle/message/Poll.scss b/src/components/middle/message/Poll.scss index 40ec5865c..8429793f1 100644 --- a/src/components/middle/message/Poll.scss +++ b/src/components/middle/message/Poll.scss @@ -79,14 +79,10 @@ .Checkbox-main { &::after { left: 0.125rem; - background-color: var(--color-primary); + background-color: var(--accent-color); - .Message.own & { - background-color: var(--accent-color); - - .theme-dark & { - background-image: url(data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMTYiIGhlaWdodD0iMTIiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PHBhdGggZD0iTTEzLjkuOEw1LjggOC45IDIuMSA1LjJjLS40LS40LTEuMS0uNC0xLjYgMC0uNC40LS40IDEuMSAwIDEuNkw1IDExLjJjLjQuNCAxLjEuNCAxLjYgMGw4LjktOC45Yy40LS40LjQtMS4xIDAtMS42LS41LS40LTEuMi0uNC0xLjYuMXoiIGZpbGw9IiM3NjZhYzgiLz48L3N2Zz4=); - } + .theme-dark & { + background-image: url(data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMTYiIGhlaWdodD0iMTIiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PHBhdGggZD0iTTEzLjkuOEw1LjggOC45IDIuMSA1LjJjLS40LS40LTEuMS0uNC0xLjYgMC0uNC40LS40IDEuMSAwIDEuNkw1IDExLjJjLjQuNCAxLjEuNCAxLjYgMGw4LjktOC45Yy40LS40LjQtMS4xIDAtMS42LS41LS40LTEuMi0uNC0xLjYuMXoiIGZpbGw9IiM3NjZhYzgiLz48L3N2Zz4=); } } } diff --git a/src/components/middle/message/Poll.tsx b/src/components/middle/message/Poll.tsx index 296cf5ca7..e0774c08b 100644 --- a/src/components/middle/message/Poll.tsx +++ b/src/components/middle/message/Poll.tsx @@ -298,6 +298,7 @@ const Poll: FC = ({ onChange={handleCheckboxChange} disabled={message.isScheduled || isSubmitting} loadingOptions={isSubmitting ? chosenOptions : undefined} + isRound /> ) : ( diff --git a/src/components/modals/stars/StarsBalanceModal.tsx b/src/components/modals/stars/StarsBalanceModal.tsx index a1a49fd84..b6a03ab0b 100644 --- a/src/components/modals/stars/StarsBalanceModal.tsx +++ b/src/components/modals/stars/StarsBalanceModal.tsx @@ -189,7 +189,6 @@ const StarsBalanceModal = ({ = ({ > {renderContent()} - + )} diff --git a/src/components/right/statistics/BoostStatistics.tsx b/src/components/right/statistics/BoostStatistics.tsx index f9e9282f0..52603a7aa 100644 --- a/src/components/right/statistics/BoostStatistics.tsx +++ b/src/components/right/statistics/BoostStatistics.tsx @@ -323,7 +323,7 @@ const BoostStatistics = ({ > {renderContent()} - + ) : (
diff --git a/src/components/ui/Checkbox.scss b/src/components/ui/Checkbox.scss index ce3110fe8..69ba5152c 100644 --- a/src/components/ui/Checkbox.scss +++ b/src/components/ui/Checkbox.scss @@ -12,6 +12,14 @@ opacity: 0.5; } + &.round { + .Checkbox-main { + &::before, &::after { + border-radius: 50%; + } + } + } + &.withIcon { padding-inline-start: 1rem; .Checkbox-main { diff --git a/src/components/ui/Checkbox.tsx b/src/components/ui/Checkbox.tsx index 5a6b8a1b2..458dcab8f 100644 --- a/src/components/ui/Checkbox.tsx +++ b/src/components/ui/Checkbox.tsx @@ -38,6 +38,7 @@ type OwnProps = { isLoading?: boolean; withCheckedCallback?: boolean; onlyInput?: boolean; + isRound?: boolean; className?: string; onChange?: (e: ChangeEvent, nestedOptionList?: IRadioOption) => void; onCheck?: (isChecked: boolean) => void; @@ -66,14 +67,15 @@ const Checkbox: FC = ({ className, rightIcon, onlyInput, - onChange, - onCheck, - onClickLabel, + isRound, nestedCheckbox, nestedCheckboxCount, nestedOptionList, leftElement, values = [], + onChange, + onCheck, + onClickLabel, }) => { const lang = useOldLang(); // eslint-disable-next-line no-null/no-null @@ -119,6 +121,7 @@ const Checkbox: FC = ({ permissionGroup && 'permission-group', Boolean(leftElement) && 'avatar', onlyInput && 'onlyInput', + isRound && 'round', className, ); diff --git a/src/components/ui/CheckboxGroup.tsx b/src/components/ui/CheckboxGroup.tsx index 9f9e4d757..37047e6fd 100644 --- a/src/components/ui/CheckboxGroup.tsx +++ b/src/components/ui/CheckboxGroup.tsx @@ -24,6 +24,7 @@ type OwnProps = { disabled?: boolean; nestedCheckbox?: boolean; loadingOptions?: string[]; + isRound?: boolean; onChange: (value: string[]) => void; }; @@ -34,6 +35,7 @@ const CheckboxGroup: FC = ({ disabled, nestedCheckbox, loadingOptions, + isRound, onChange, }) => { const [values, setValues] = useState(selected || []); @@ -93,6 +95,7 @@ const CheckboxGroup: FC = ({ nestedCheckboxCount={getCheckedNestedCount(option.nestedOptions ?? [])} nestedOptionList={option} values={values} + isRound={isRound} /> ); })} diff --git a/src/components/ui/TabList.scss b/src/components/ui/TabList.scss index d6e5c329b..577872f09 100644 --- a/src/components/ui/TabList.scss +++ b/src/components/ui/TabList.scss @@ -18,10 +18,6 @@ scrollbar-width: none; scrollbar-color: rgba(0, 0, 0, 0); - &.big { - font-size: 1rem; - } - &::-webkit-scrollbar { height: 0; } diff --git a/src/components/ui/TabList.tsx b/src/components/ui/TabList.tsx index 3db856ecb..dbd393a0f 100644 --- a/src/components/ui/TabList.tsx +++ b/src/components/ui/TabList.tsx @@ -29,7 +29,6 @@ type OwnProps = { tabs: readonly TabWithProperties[]; areFolders?: boolean; activeTab: number; - big?: boolean; className?: string; onSwitchTab: (index: number) => void; contextRootElementSelector?: string; @@ -40,7 +39,7 @@ const TAB_SCROLL_THRESHOLD_PX = 16; const SCROLL_DURATION = IS_IOS ? 450 : IS_ANDROID ? 400 : 300; const TabList: FC = ({ - tabs, areFolders, activeTab, big, onSwitchTab, + tabs, areFolders, activeTab, onSwitchTab, contextRootElementSelector, className, }) => { // eslint-disable-next-line no-null/no-null @@ -77,7 +76,7 @@ const TabList: FC = ({ return (