Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Fix flex values after blur changes #6641

Merged
merged 2 commits into from
Aug 20, 2021
Merged

Fix flex values after blur changes #6641

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f5a284a
Fix flex values after blur changes
Aug 19, 2021
67ce081
Fix one line too much in scss
Aug 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions res/css/structures/_LeftPanel.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,11 @@ $roomListCollapsedWidth: 68px;
}
}

.mx_LeftPanel_wrapper {
display: flex;
max-width: 50%;
}

.mx_LeftPanel {
background-color: $roomlist-bg-color;
// TODO decrease this once Spaces launches as it'll no longer need to include the 56px Community Panel
Expand Down
4 changes: 1 addition & 3 deletions res/css/structures/_MatrixChat.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,7 @@ limitations under the License.
display: flex;

flex: 1;
flex-grow: 0;
min-height: 0;
max-width: 50%;
}

.mx_MatrixChat_syncError {
Expand All @@ -65,7 +63,7 @@ limitations under the License.
}

/* not the left panel, and not the resize handle, so the roomview/groupview/... */
.mx_MatrixChat > :not(.mx_LeftPanel):not(.mx_SpacePanel):not(.mx_ResizeHandle) {
.mx_MatrixChat > :not(.mx_LeftPanel):not(.mx_SpacePanel):not(.mx_ResizeHandle):not(.mx_LeftPanel_wrapper) {
background-color: $primary-bg-color;

flex: 1 1 0;
Expand Down
24 changes: 13 additions & 11 deletions src/components/structures/LoggedInView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -644,18 +644,20 @@ class LoggedInView extends React.Component<IProps, IState> {
aria-hidden={this.props.hideToSRUsers}
>
<ToastContainer />
<div ref={this._resizeContainer} className={bodyClasses}>
<BackdropPanel
backgroundImage={this.state.backgroundImage}
/>
{ SpaceStore.spacesEnabled ? <SpacePanel /> : null }
<LeftPanel
isMinimized={this.props.collapseLhs || false}
resizeNotifier={this.props.resizeNotifier}
/>
<ResizeHandle />
<div className={bodyClasses}>
<div ref={this._resizeContainer} className='mx_LeftPanel_wrapper'>
<BackdropPanel
backgroundImage={this.state.backgroundImage}
/>
{ SpaceStore.spacesEnabled ? <SpacePanel /> : null }
<LeftPanel
isMinimized={this.props.collapseLhs || false}
resizeNotifier={this.props.resizeNotifier}
/>
<ResizeHandle />
</div>
{ pageElement }
</div>
{ pageElement }
</div>
<CallContainer />
<NonUrgentToastContainer />
Expand Down