Picker Refactoring: Even more fixes (#4895)

This commit is contained in:
zubiden 2024-08-29 15:52:42 +02:00 committed by Alexander Zinchuk
parent 489d92dd1c
commit 82443183e3
12 changed files with 49 additions and 32 deletions

View File

@ -115,7 +115,7 @@
.other-column-title { .other-column-title {
font-size: 0.9375rem; font-size: 0.9375rem;
margin-left: 1.5rem; margin-inline-start: 1.5rem;
} }
.other-columns { .other-columns {

View File

@ -14,6 +14,7 @@
background-color: var(--background-color); background-color: var(--background-color);
color: var(--color-text); color: var(--color-text);
line-height: 1.25; line-height: 1.25;
text-align: initial;
transition-property: background-color, opacity; transition-property: background-color, opacity;
transition-duration: 150ms; transition-duration: 150ms;

View File

@ -313,7 +313,9 @@ const ChatExtra: FC<OwnProps & StateProps> = ({
handleUsernameClick(mainUsername, isChat); handleUsernameClick(mainUsername, isChat);
}} }}
> >
<span className="title" dir="auto">{formatUsername(mainUsername.username, isChat)}</span> <span className="title" dir={lang.isRtl ? 'rtl' : undefined}>
{formatUsername(mainUsername.username, isChat)}
</span>
<span className="subtitle"> <span className="subtitle">
{usernameLinks && <span className="other-usernames">{usernameLinks}</span>} {usernameLinks && <span className="other-usernames">{usernameLinks}</span>}
{oldLang(isChat ? 'Link' : 'Username')} {oldLang(isChat ? 'Link' : 'Username')}
@ -343,7 +345,7 @@ const ChatExtra: FC<OwnProps & StateProps> = ({
{Boolean(formattedNumber?.length) && ( {Boolean(formattedNumber?.length) && (
// eslint-disable-next-line react/jsx-no-bind // eslint-disable-next-line react/jsx-no-bind
<ListItem icon="phone" multiline narrow ripple onClick={handlePhoneClick}> <ListItem icon="phone" multiline narrow ripple onClick={handlePhoneClick}>
<span className="title" dir="auto">{formattedNumber}</span> <span className="title" dir={lang.isRtl ? 'rtl' : undefined}>{formattedNumber}</span>
<span className="subtitle">{oldLang('Phone')}</span> <span className="subtitle">{oldLang('Phone')}</span>
</ListItem> </ListItem>
)} )}
@ -356,7 +358,7 @@ const ChatExtra: FC<OwnProps & StateProps> = ({
isStatic isStatic
allowSelection allowSelection
> >
<span className="title word-break allow-selection" dir="auto"> <span className="title word-break allow-selection" dir={lang.isRtl ? 'rtl' : undefined}>
{ {
renderText(description, [ renderText(description, [
'br', 'br',

View File

@ -175,7 +175,9 @@ const UserBirthday = ({
isStatic={isStatic} isStatic={isStatic}
onSecondaryIconClick={handleOpenPremiumGiftModal} onSecondaryIconClick={handleOpenPremiumGiftModal}
> >
<div className="title">{renderText(lang(valueKey, [formattedDate, age], undefined, age))}</div> <div className="title" dir={lang.isRtl ? 'rtl' : undefined}>
{renderText(lang(valueKey, [formattedDate, age], undefined, age))}
</div>
<span className="subtitle">{lang(isToday ? 'ProfileBirthdayToday' : 'ProfileBirthday')}</span> <span className="subtitle">{lang(isToday ? 'ProfileBirthdayToday' : 'ProfileBirthday')}</span>
</ListItem> </ListItem>
{isPlayingAnimation && IS_OFFSET_PATH_SUPPORTED && numbersForAge?.map((sticker, index) => ( {isPlayingAnimation && IS_OFFSET_PATH_SUPPORTED && numbersForAge?.map((sticker, index) => (

View File

@ -129,6 +129,7 @@
.settings-item-simple, .settings-item-simple,
.settings-item { .settings-item {
text-align: initial;
padding: 1.5rem 0.5rem 1rem; padding: 1.5rem 0.5rem 1rem;
@include mixins.adapt-padding-to-scrollbar(0.5rem); @include mixins.adapt-padding-to-scrollbar(0.5rem);
@ -148,10 +149,6 @@
margin-bottom: 1.25rem; margin-bottom: 1.25rem;
padding-inline-start: 1rem; padding-inline-start: 1rem;
position: relative; position: relative;
&[dir="rtl"] {
text-align: right;
}
} }
&-slider { &-slider {
@ -162,7 +159,7 @@
font-size: 0.875rem; font-size: 0.875rem;
color: var(--color-text-secondary); color: var(--color-text-secondary);
margin-top: -0.5rem; margin-top: -0.5rem;
margin-bottom: 1.5rem; margin-bottom: 1rem;
padding-inline-start: 1rem; padding-inline-start: 1rem;
.settings-content.two-fa &, .settings-content.two-fa &,
@ -396,7 +393,7 @@
.SettingsDefaultReaction { .SettingsDefaultReaction {
.current-default-reaction { .current-default-reaction {
margin-inline-end: 1.1875rem; margin-inline-end: 1.75rem;
} }
} }

View File

@ -102,7 +102,7 @@ const SettingsStickers: FC<OwnProps & StateProps> = ({
onCheck={handleSuggestStickersChange} onCheck={handleSuggestStickersChange}
/> />
<ListItem <ListItem
className="mt-4" narrow
// eslint-disable-next-line react/jsx-no-bind // eslint-disable-next-line react/jsx-no-bind
onClick={() => onScreenSelect(SettingsScreens.CustomEmoji)} onClick={() => onScreenSelect(SettingsScreens.CustomEmoji)}
icon="smile" icon="smile"
@ -113,6 +113,7 @@ const SettingsStickers: FC<OwnProps & StateProps> = ({
{defaultReaction && ( {defaultReaction && (
<ListItem <ListItem
className="SettingsDefaultReaction" className="SettingsDefaultReaction"
narrow
// eslint-disable-next-line react/jsx-no-bind // eslint-disable-next-line react/jsx-no-bind
onClick={() => onScreenSelect(SettingsScreens.QuickReaction)} onClick={() => onScreenSelect(SettingsScreens.QuickReaction)}
> >

View File

@ -259,17 +259,21 @@ const ManageDiscussion: FC<OwnProps & StateProps> = ({
{linkedChat && ( {linkedChat && (
<div className="section"> <div className="section">
<h3 className="section-heading">{lang('ChannelSettingsJoinTitle')}</h3> <h3 className="section-heading">{lang('ChannelSettingsJoinTitle')}</h3>
<Checkbox <div className="ListItem narrow">
checked={isJoinToSend}
onCheck={handleJoinToSendCheck}
label={lang('ChannelSettingsJoinToSend')}
/>
{isJoinToSend && (
<Checkbox <Checkbox
checked={isJoinRequest} checked={isJoinToSend}
onCheck={handleJoinRequestCheck} onCheck={handleJoinToSendCheck}
label={lang('ChannelSettingsJoinRequest')} label={lang('ChannelSettingsJoinToSend')}
/> />
</div>
{isJoinToSend && (
<div className="ListItem narrow">
<Checkbox
checked={isJoinRequest}
onCheck={handleJoinRequestCheck}
label={lang('ChannelSettingsJoinRequest')}
/>
</div>
)} )}
<p className="text-muted"> <p className="text-muted">
{isJoinToSend ? lang('ChannelSettingsJoinRequestInfo') : lang('ChannelSettingsJoinToSendInfo')} {isJoinToSend ? lang('ChannelSettingsJoinRequestInfo') : lang('ChannelSettingsJoinToSendInfo')}

View File

@ -226,7 +226,7 @@ const ManageReactions: FC<OwnProps & StateProps> = ({
</p> </p>
</div> </div>
{localEnabledReactions?.type === 'some' && ( {localEnabledReactions?.type === 'some' && (
<div className="section"> <div className="section section-with-fab">
<h3 className="section-heading"> <h3 className="section-heading">
{lang('OnlyAllowThisReactions')} {lang('OnlyAllowThisReactions')}
</h3> </h3>

View File

@ -32,6 +32,10 @@
border-top: none; border-top: none;
} }
&.section-with-fab {
padding-bottom: 3.5rem;
}
> .ChatInfo { > .ChatInfo {
margin: 0 0 2rem !important; margin: 0 0 2rem !important;
@ -126,10 +130,12 @@
.RangeSlider { .RangeSlider {
margin-top: 2rem; margin-top: 2rem;
margin-inline-start: 1rem;
} }
.radio-group { .radio-group {
margin-top: 2rem; margin-block: 2rem;
margin-inline-start: 1rem;
.Radio { .Radio {
padding-left: 3.5rem; padding-left: 3.5rem;

View File

@ -3,7 +3,7 @@
position: relative; position: relative;
padding-inline-start: 3.5rem; padding-inline-start: 3.5rem;
text-align: left; text-align: left;
margin-bottom: 1.5rem; margin-block: 0.75rem;
line-height: 1.5rem; line-height: 1.5rem;
cursor: var(--custom-cursor, pointer); cursor: var(--custom-cursor, pointer);
@ -69,10 +69,10 @@
content: ""; content: "";
display: block; display: block;
position: absolute; position: absolute;
left: 1rem; left: 1.125rem;
top: 0.1875rem; top: 0.125rem;
width: 1.125rem; width: 1.25rem;
height: 1.125rem; height: 1.25rem;
} }
&::before { &::before {

View File

@ -178,6 +178,7 @@
.ListItem-button { .ListItem-button {
padding: 0.5rem 1rem; padding: 0.5rem 1rem;
min-height: 3rem;
} }
.ListItem-main-icon { .ListItem-main-icon {
@ -438,6 +439,10 @@
.subtitle { .subtitle {
display: block; display: block;
text-align: initial; text-align: initial;
&[dir="rtl"] {
text-align: right;
}
} }
.title { .title {

View File

@ -3,7 +3,7 @@
position: relative; position: relative;
padding-inline-start: 3.5rem; padding-inline-start: 3.5rem;
text-align: left; text-align: left;
margin-bottom: 1.5rem; margin-block: 0.75rem;
line-height: 1.5rem; line-height: 1.5rem;
cursor: var(--custom-cursor, pointer); cursor: var(--custom-cursor, pointer);
@ -153,7 +153,7 @@
} }
&.onlyInput { &.onlyInput {
margin-bottom: 1.25rem; margin-block: 0 1.25rem;
line-height: 1.25rem; line-height: 1.25rem;
padding-inline-start: 1.25rem; padding-inline-start: 1.25rem;
@ -172,8 +172,7 @@
} }
.Spinner { .Spinner {
left: 0; inset: 0 !important;
top: 0;
transform: none; transform: none;
} }
} }