mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Fix sidebar notices in collapsed mode

Browse source
This commit is contained in:
Jamie Kyle 2023-09-11 13:55:51 -07:00 committed by GitHub
parent 30da67da1a
commit 6ae0edcc1e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
stylesheets/components/LeftPaneDialog.scss
View file

@ -34,7 +34,7 @@
letter-spacing: -0.0025em; letter-spacing: -0.0025em;
font-weight: 400; font-weight: 400;
.module-left-pane--width-narrow & { &--width-narrow {
padding-inline-start: 36px; padding-inline-start: 36px;
} }
@ -56,10 +56,6 @@
&__container-close { &__container-close {
display: flex; display: flex;
justify-content: flex-end; justify-content: flex-end;
.module-left-pane--width-narrow & {
display: none;
}
} }
&__spinner-container { &__spinner-container {
@ -169,10 +165,6 @@
&__message { &__message {
width: 100%; width: 100%;
.module-left-pane--width-narrow & {
display: none;
}
} }
&__message, &__message,

15
ts/components/LeftPaneDialog.tsx
View file

@ -109,7 +109,7 @@ export function LeftPaneDialog({
} }
let xButton: ReactNode; let xButton: ReactNode;
if (hasXButton) { if (hasXButton && containerWidthBreakpoint !== WidthBreakpoint.Narrow) {
xButton = ( xButton = (
<div className={`${BASE_CLASS_NAME}__container-close`}> <div className={`${BASE_CLASS_NAME}__container-close`}>
<button <button
@ -124,11 +124,12 @@ export function LeftPaneDialog({
); );
} }
const className = classNames([ const className = classNames(BASE_CLASS_NAME, {
BASE_CLASS_NAME, [`${BASE_CLASS_NAME}--width-narrow`]:
type === undefined ? undefined : `${BASE_CLASS_NAME}--${type}`, containerWidthBreakpoint === WidthBreakpoint.Narrow,
onClick === undefined ? undefined : `${BASE_CLASS_NAME}--clickable`, [`${BASE_CLASS_NAME}--${type}`]: type != null,
]); [`${BASE_CLASS_NAME}--clickable`]: onClick != null,
});
const message = ( const message = (
<> <>
@ -143,7 +144,9 @@ export function LeftPaneDialog({
<> <>
<div className={`${BASE_CLASS_NAME}__container`}> <div className={`${BASE_CLASS_NAME}__container`}>
{typeof icon === 'string' ? <div className={iconClassName} /> : icon} {typeof icon === 'string' ? <div className={iconClassName} /> : icon}
{containerWidthBreakpoint !== WidthBreakpoint.Narrow && (
<div className={`${BASE_CLASS_NAME}__message`}>{message}</div> <div className={`${BASE_CLASS_NAME}__message`}>{message}</div>
)}
</div> </div>
{xButton} {xButton}
</> </>