Skip to content

Commit 47ced3f

Browse files
committed
feat: remove blur effect in space
1 parent d594441 commit 47ced3f

File tree

3 files changed

+17
-3
lines changed

3 files changed

+17
-3
lines changed

res/css/structures/_SpacePanel.pcss

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,11 @@ Please see LICENSE files in the repository root for full details.
3030
width: 68px;
3131
}
3232

33+
&.newUi {
34+
background-color: var(--cpd-color-bg-canvas-default);
35+
border-right: 1px solid var(--cpd-color-bg-subtle-primary);
36+
}
37+
3338
.mx_SpacePanel_toggleCollapse {
3439
position: absolute;
3540
width: 18px;

src/components/structures/LoggedInView.tsx

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -701,6 +701,8 @@ class LoggedInView extends React.Component<IProps, IState> {
701701
return <AudioFeedArrayForLegacyCall call={call} key={call.callId} />;
702702
});
703703

704+
const newRoomListEnabled = SettingsStore.getValue("feature_new_room_list");
705+
704706
return (
705707
<MatrixClientContextProvider client={this._matrixClient}>
706708
<div
@@ -714,9 +716,11 @@ class LoggedInView extends React.Component<IProps, IState> {
714716
<div className="mx_LeftPanel_outerWrapper">
715717
<LeftPanelLiveShareWarning isMinimized={this.props.collapseLhs || false} />
716718
<div className="mx_LeftPanel_wrapper">
717-
<BackdropPanel blurMultiplier={0.5} backgroundImage={this.state.backgroundImage} />
719+
{!newRoomListEnabled && (
720+
<BackdropPanel blurMultiplier={0.5} backgroundImage={this.state.backgroundImage} />
721+
)}
718722
<SpacePanel />
719-
<BackdropPanel backgroundImage={this.state.backgroundImage} />
723+
{!newRoomListEnabled && <BackdropPanel backgroundImage={this.state.backgroundImage} />}
720724
<div
721725
className="mx_LeftPanel_wrapper--user"
722726
ref={this._resizeContainer}

src/components/views/spaces/SpacePanel.tsx

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -363,6 +363,8 @@ const SpacePanel: React.FC = () => {
363363
}
364364
});
365365

366+
const newRoomListEnabled = useSettingValue("feature_new_room_list");
367+
366368
return (
367369
<RovingTabIndexProvider handleHomeEnd handleUpDown={!dragging}>
368370
{({ onKeyDownHandler, onDragEndHandler }) => (
@@ -378,7 +380,10 @@ const SpacePanel: React.FC = () => {
378380
}}
379381
>
380382
<nav
381-
className={classNames("mx_SpacePanel", { collapsed: isPanelCollapsed })}
383+
className={classNames("mx_SpacePanel", {
384+
collapsed: isPanelCollapsed,
385+
newUi: newRoomListEnabled,
386+
})}
382387
onKeyDown={(ev) => {
383388
const navAction = getKeyBindingsManager().getNavigationAction(ev);
384389
if (

0 commit comments

Comments
 (0)