Settings: Various fixes (#3312)
This commit is contained in:
parent
39693e40ba
commit
11aa44de56
@ -47,6 +47,7 @@
|
|||||||
&.infinite-scroll {
|
&.infinite-scroll {
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
|
overflow-y: hidden;
|
||||||
|
|
||||||
& > .custom-scroll {
|
& > .custom-scroll {
|
||||||
flex: 1 1 auto;
|
flex: 1 1 auto;
|
||||||
@ -126,6 +127,11 @@
|
|||||||
padding: 1.5rem 1.5rem 1rem;
|
padding: 1.5rem 1.5rem 1rem;
|
||||||
box-shadow: inset 0 -0.0625rem 0 0 var(--color-background-secondary-accent);
|
box-shadow: inset 0 -0.0625rem 0 0 var(--color-background-secondary-accent);
|
||||||
border-bottom: 0.625rem solid var(--color-background-secondary);
|
border-bottom: 0.625rem solid var(--color-background-secondary);
|
||||||
|
|
||||||
|
&:last-child {
|
||||||
|
border-bottom: none;
|
||||||
|
box-shadow: none;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.settings-item {
|
.settings-item {
|
||||||
|
|||||||
@ -149,7 +149,7 @@ const SettingsActiveSessions: FC<OwnProps & StateProps> = ({
|
|||||||
</h4>
|
</h4>
|
||||||
|
|
||||||
<ListItem narrow inactive icon={`device-${getSessionIcon(session)} icon-device`}>
|
<ListItem narrow inactive icon={`device-${getSessionIcon(session)} icon-device`}>
|
||||||
<div className="multiline-menu-item" dir="auto">
|
<div className="multiline-menu-item full-size" dir="auto">
|
||||||
<span className="title" dir="auto">{session.deviceModel}</span>
|
<span className="title" dir="auto">{session.deviceModel}</span>
|
||||||
<span className="subtitle black tight">
|
<span className="subtitle black tight">
|
||||||
{session.appName} {session.appVersion}, {session.platform} {session.systemVersion}
|
{session.appName} {session.appVersion}, {session.platform} {session.systemVersion}
|
||||||
|
|||||||
@ -19,6 +19,11 @@
|
|||||||
box-shadow: inset 0 -0.0625rem 0 0 var(--color-background-secondary-accent);
|
box-shadow: inset 0 -0.0625rem 0 0 var(--color-background-secondary-accent);
|
||||||
border-bottom: 0.625rem solid var(--color-background-secondary);
|
border-bottom: 0.625rem solid var(--color-background-secondary);
|
||||||
|
|
||||||
|
&:last-child {
|
||||||
|
border-bottom: none;
|
||||||
|
box-shadow: none;
|
||||||
|
}
|
||||||
|
|
||||||
&.wide {
|
&.wide {
|
||||||
padding: 1.5rem;
|
padding: 1.5rem;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -273,7 +273,7 @@ addActionHandler('loadBlockedContacts', async (global): Promise<void> => {
|
|||||||
...global,
|
...global,
|
||||||
blocked: {
|
blocked: {
|
||||||
...global.blocked,
|
...global.blocked,
|
||||||
ids: [...(global.blocked.ids || []), ...result.blockedIds],
|
ids: result.blockedIds,
|
||||||
totalCount: result.totalCount,
|
totalCount: result.totalCount,
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user